Automation/app
jens 41efa7c11b 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
#	build.gradle
#	fastlane/metadata/android/en-US/changelogs/119.txt
2022-05-15 01:54:32 +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-15 01:54:32 +02:00
.gitignore
build.gradle new release prep 2022-05-15 01:37:18 +02:00
proguard-rules.pro