tom79 a5e945f0be Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-de/strings.xml # app/src/main/res/values-gl/strings.xml # app/src/main/res/values-ml/strings.xml # app/src/main/res/values-sv/strings.xml		2019-11-15 18:31:08 +01:00
..
strings.xml	Merge branch 'l10n_develop' into develop	2019-11-15 18:31:08 +01:00