6977b4c6b8
Conflicts: android-app-core/res/values-ru/text_strings.xml android-app-core/res/values-ru/text_wizard.xml android-app-core/res/values/text_strings.xml android-app-core/res/values/text_wizard.xml |
||
---|---|---|
.. | ||
res | ||
src/main | ||
AndroidManifest.xml | ||
pom.xml |