jens 937c6ffe1d Merge remote-tracking branch 'origin/development' into development ... # Conflicts: # app/src/main/res/values/strings.xml		2022-07-19 17:58:41 +02:00
..
src	Merge remote-tracking branch 'origin/development' into development	2022-07-19 17:58:41 +02:00
.gitignore	Initial commit	2021-02-16 13:42:49 +01:00
build.gradle	new version prep	2022-06-25 02:36:33 +02:00
proguard-rules.pro	Initial commit	2021-02-16 13:42:49 +01:00