tom79 c0ed768845 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-ca/strings.xml		2019-11-21 18:54:19 +01:00
..
strings.xml	Merge branch 'l10n_develop' into develop	2019-11-21 18:54:19 +01:00