Alexander Sytnyk cd5b3875a3 Merge branch 'master' of ssh://github.com/osmandapp/Osmand into alex_fixes ... # Conflicts: # OsmAnd/res/values-da/strings.xml # OsmAnd/res/values-es-rAR/strings.xml # OsmAnd/res/values-es-rUS/strings.xml # OsmAnd/res/values-zh-rTW/strings.xml		2017-07-17 13:12:00 +03:00
..
phrases.xml	Translated using Weblate (Chinese (Traditional))	2017-07-14 10:04:58 +02:00
strings.xml	Merge branch 'master' of ssh://github.com/osmandapp/Osmand into alex_fixes	2017-07-17 13:12:00 +03:00