Felix Prahl-Kamps 80b58bc77f Merge branch 'master' into '1-patch-master' ... # Conflicts: # .idea/assetWizardSettings.xml # .idea/modules.xml # app/build.gradle # app/src/main/AndroidManifest.xml # app/src/main/res/layout/activity_main.xml # app/src/main/res/values/colors.xml # app/src/main/res/values/strings.xml # app/src/main/res/values/styles.xml # build.gradle # gradle.properties # gradle/wrapper/gradle-wrapper.properties		2018-04-22 02:00:45 +02:00
..
ic_action_name.png	Initial commit	2018-04-22 01:50:05 +02:00
ic_settings.png	Initial commit	2018-04-03 18:17:38 +02:00