Christian Schabesberger 849a45a3ca resolve conflict		2017-01-22 14:26:01 +01:00
..
src	resolve conflict	2017-01-22 14:26:01 +01:00
.gitignore
build.gradle	resolve conflict	2017-01-22 14:26:01 +01:00
proguard-rules.pro