Christian Basler 30bb407bbf Merge remote-tracking branch 'origin/develop' into feature/support-info ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values/strings.xml		2016-10-07 23:13:06 +02:00
..
src/main	Merge remote-tracking branch 'origin/develop' into feature/support-info	2016-10-07 23:13:06 +02:00
.gitignore	Initial commit	2015-08-05 19:48:41 +02:00
build.gradle	Fixed some layouts and updated dependencies	2016-10-06 22:01:33 +02:00
proguard-rules.pro	Initial commit	2015-08-05 19:48:41 +02:00