Vitaliy 5be8902e02 Merge branch 'master' into track_appearance ... # Conflicts: # OsmAnd/res/values-ru/strings.xml # OsmAnd/res/values/strings.xml # OsmAnd/src/net/osmand/plus/views/GPXLayer.java # OsmAnd/src/net/osmand/plus/views/RouteLayer.java		2020-07-20 17:30:15 +03:00
..
main/java	Merge branch 'master' into track_appearance	2020-07-20 17:30:15 +03:00
test	Merge pull request #9277 from osmandapp/directional_traffic_signals	2020-06-24 11:17:51 +02:00