jens 98b49036a7 Merge remote-tracking branch 'origin/development-stable' into development ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values-es/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-nl/strings.xml # app/src/main/res/values/strings.xml		2022-05-21 14:08:19 +02:00
..
googlePlayFlavor/release	new release prep	2022-05-15 01:37:18 +02:00
src	Merge remote-tracking branch 'origin/development-stable' into development	2022-05-21 14:08:19 +02:00
.gitignore	Initial commit	2021-02-16 13:42:49 +01:00
build.gradle	new release prep	2022-05-15 01:37:18 +02:00
proguard-rules.pro	Initial commit	2021-02-16 13:42:49 +01:00