Caesar2011 67138dee8b Merge branch 'master' of https://git.imp.fu-berlin.de/seedorf96/fuplanner ...

# Conflicts:
#	.idea/misc.xml
#	app/src/main/java/de/sebse/fuplanner/MainActivity.java
#	app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java

2018-10-19 00:55:22 +02:00

..

libs

Module Detail Overview Implementation #1

2018-05-16 23:43:47 +02:00

src

Merge branch 'master' of https://git.imp.fu-berlin.de/seedorf96/fuplanner

2018-10-19 00:55:22 +02:00

.gitignore

Initial commit

2018-04-24 09:48:17 +02:00

build.gradle

Migration to AndroidX

2018-10-19 00:25:50 +02:00