Stefan Schueller 45f0531394 Merge branch 'develop' into Login ... # Conflicts: # app/src/main/res/values/strings.xml		2018-12-29 16:43:58 +01:00
..
src	Merge branch 'develop' into Login	2018-12-29 16:43:58 +01:00
build.gradle	Merge branch 'develop' into Login	2018-12-29 16:43:58 +01:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00