Joshua 1094298761 Merge remote-tracking branch 'origin/master' ...

# Conflicts:
#	.idea/misc.xml
#	app/build.gradle
#	app/src/main/java/de/sebse/fuplanner/fragments/LoginFragment.java
#	app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java
#	app/src/main/res/values-de/arrays.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/arrays.xml
#	app/src/main/res/values/preferences.xml
#	app/src/main/res/xml/preferences.xml
#	build.gradle

2018-08-10 14:00:21 +02:00

.idea

Shortened German Translation for Canteen Option

2018-08-09 18:45:12 +02:00

app

Bug Fixes (Double Click, Login Fragment Title)

2018-08-09 23:00:16 +02:00

docs

Shortened German Translation for Canteen Option

2018-08-09 18:45:12 +02:00

gradle/wrapper

Initial commit

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

logo

New icon!

2018-08-01 19:23:16 +02:00

.gitignore

Initial commit

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

build.gradle

Shortened German Translation for Canteen Option

2018-08-09 18:45:12 +02:00

datenschutz.md

Data policy uploaded

2018-07-30 18:11:38 +02:00

gradle.properties

Initial commit

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

gradlew

Initial commit

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

gradlew.bat

Initial commit

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

settings.gradle

Initial commit

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

Description

No description provided

4.9 MiB

Languages

Java 100%