Jens b0d509aafe Merge remote-tracking branch 'origin/development-stable' into development ...

# Conflicts:
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values/strings.xml

2022-06-27 23:04:33 +02:00

..

googlePlayFlavor/release

new version prep

2022-06-25 02:36:33 +02:00

src

Merge remote-tracking branch 'origin/development-stable' into development

2022-06-27 23:04:33 +02:00

.gitignore

…

build.gradle

new version prep

2022-06-25 02:36:33 +02:00

proguard-rules.pro

…