Stefan Schüller 341b62fa57 Merge remote-tracking branch 'GitHub/master' into develop ... # Conflicts: # app/src/main/res/values/strings.xml # app/src/main/res/xml/pref_general.xml		2020-06-19 08:37:15 +02:00
..
src	Merge remote-tracking branch 'GitHub/master' into develop	2020-06-19 08:37:15 +02:00
build.gradle	Release 1.0.36 (#166)	2020-06-14 18:32:28 +02:00
proguard-rules.pro	Init	2018-03-03 01:10:13 +01:00