zwicki 9ecb6b17c3 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/res/layout/singlebutton.xml		2021-06-18 21:28:54 +02:00
..
src	Merge remote-tracking branch 'origin/master'	2021-06-18 21:28:54 +02:00
.gitignore	hi	2021-03-04 21:18:38 +01:00
build.gradle	dynamic content update	2021-06-12 16:21:13 +02:00
proguard-rules.pro	hi	2021-03-04 21:18:38 +01:00