stom79 020811e2ed Merge branch 'l10n_crowdin_localization_gitlab' into develop ... # Conflicts: # app/src/main/res/values-ar/strings.xml # app/src/main/res/values-fr/strings.xml # app/src/main/res/values-he/strings.xml # app/src/main/res/values-hi/strings.xml # app/src/main/res/values-hu/strings.xml # app/src/main/res/values-hy/strings.xml # app/src/main/res/values-id/strings.xml # app/src/main/res/values-ja/strings.xml # app/src/main/res/values-kab/strings.xml # app/src/main/res/values-ko/strings.xml # app/src/main/res/values-lmo/strings.xml # app/src/main/res/values-mk/strings.xml # app/src/main/res/values-oc/strings.xml # app/src/main/res/values-pt/strings.xml # app/src/main/res/values-ro/strings.xml # app/src/main/res/values-si/strings.xml # app/src/main/res/values-sl/strings.xml # app/src/main/res/values-sr/strings.xml # app/src/main/res/values-sv/strings.xml # app/src/main/res/values-tr/strings.xml # app/src/main/res/values-uk/strings.xml # app/src/main/res/values-vi/strings.xml # app/src/main/res/values-zh-rCN/strings.xml		2019-01-20 19:09:37 +01:00
..
src	Merge branch 'l10n_crowdin_localization_gitlab' into develop	2019-01-20 19:09:37 +01:00
.gitignore	…
build.gradle	webrtc	2019-01-18 14:48:42 +01:00
proguard-rules.pro	…