Andreas E 7f88b56d8b Resolve merge conflicts		2020-06-23 10:23:14 +02:00
..
src	Resolve merge conflicts	2020-06-23 10:23:14 +02:00
.gitignore
build.gradle	Stop IDE from complaining about missing translations	2020-06-17 09:10:12 -04:00
proguard-rules.pro
shortcuts.xml