Stefan Niedermann 5e04817640 Merge branch 'master' into branding ... # Conflicts: # app/src/main/res/values/strings.xml		2020-06-01 14:28:24 +02:00
..
src	Merge branch 'master' into branding	2020-06-01 14:28:24 +02:00
.classpath
.gitignore	Added flavor builds to .gitignore	2020-03-27 10:20:05 +01:00
.project
build.gradle	version bump to 2.12.2	2020-06-01 14:15:15 +02:00
proguard-project.txt
proguard-rules.pro
project.properties