Vitaliy 2967b8f140 Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads ... # Conflicts: # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/settings/ConfigureMenuItemsFragment.java		2020-04-20 17:12:05 +03:00
..
main/java	Merge branch 'master' of https://github.com/osmandapp/Osmand into custom_downloads	2020-04-20 17:12:05 +03:00
test	Fixed gpx to route feature	2020-03-15 19:17:38 +03:00