tom79 6770394629 Merge branch 'l10n_develop' into develop ... # Conflicts: # app/src/main/res/values-ca/strings.xml		2020-02-04 18:43:40 +01:00
..
strings.xml	Merge branch 'l10n_develop' into develop	2020-02-04 18:43:40 +01:00