Victor Shcherb 25f4707621 Merge branch 'master' of github.com:osmandapp/Osmand ... Conflicts: OsmAnd/res/values-ca/strings.xml OsmAnd/res/values-el/strings.xml OsmAnd/res/values-he/strings.xml OsmAnd/res/values-pt-rBR/strings.xml OsmAnd/res/values-zh-rTW/strings.xml		2018-05-09 16:02:39 +02:00
..
phrases.xml	Add phrases	2018-04-05 13:39:14 +03:00
strings.xml	Merge branch 'master' of github.com:osmandapp/Osmand	2018-05-09 16:02:39 +02:00