zwicki 9ecb6b17c3 Merge remote-tracking branch 'origin/master' ... # Conflicts: # app/src/main/res/layout/singlebutton.xml		2021-06-18 21:28:54 +02:00
..
androidTest/java/de/jg_cody/Teraplex	Zurück-Button minimiert app	2021-03-29 18:11:32 +02:00
main	Merge remote-tracking branch 'origin/master'	2021-06-18 21:28:54 +02:00
test/java/de/jg_cody/Teraplex	Zurück-Button minimiert app	2021-03-29 18:11:32 +02:00