tom79 27ae8790a0 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-es/strings.xml # app/src/main/res/values-eu/strings.xml # app/src/main/res/values-it/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-kab/strings.xml # app/src/main/res/values-ru/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2020-03-07 16:18:59 +01:00
..
strings.xml	Merge branch 'l10n_develop' into develop	2020-03-07 16:18:59 +01:00