Vitaliy 500cb007b8 Merge branch 'master' into route_altitude_slope ... # Conflicts: # OsmAnd/src/net/osmand/plus/routing/cards/RouteLineColorCard.java		2021-04-22 19:34:46 +03:00
..
main/java	Merge branch 'master' into route_altitude_slope	2021-04-22 19:34:46 +03:00
test	Fix #11376	2021-04-19 20:10:27 +02:00