Myzel394 5b85c07e4b
Merge branch 'master' into l10n_weblate
# Conflicts:
#	app/src/main/res/values-de-DE/strings.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-tr-TR/strings.xml
#	app/src/main/res/values-tr/strings.xml
#	app/src/main/res/values-zh-CN/strings.xml
#	app/src/main/res/values-zh/strings.xml
2023-10-22 22:33:46 +02:00
..
2023-08-02 13:53:07 +02:00
2023-10-19 19:03:53 +02:00
2023-08-02 13:53:07 +02:00