Vitaliy 88d4365e86 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins ... # Conflicts: # OsmAnd/res/values/strings.xml		2020-03-30 10:43:31 +03:00
..
main/java	Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_plugins	2020-03-30 10:43:31 +03:00
test	Fixed gpx to route feature	2020-03-15 19:17:38 +03:00