Thomas 111c46d168 Merge branch 'l10n_develop' into develop ...

# Conflicts:
#	app/src/main/res/values-el/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-it/strings.xml

2020-02-19 11:32:34 +01:00

..

src

Merge branch 'l10n_develop' into develop

2020-02-19 11:32:34 +01:00

.gitignore

First commit

2020-01-25 10:25:02 +01:00

build.gradle

flavor

2020-02-19 11:31:36 +01:00

proguard-rules.pro

First commit

2020-01-25 10:25:02 +01:00