tom79 6b4c034507 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-ml/strings.xml		2019-11-15 19:38:37 +01:00
..
android	Merge branch 'l10n_develop' into develop	2019-11-15 19:38:37 +01:00