Vitaliy 109d9aa1bb Merge branch 'master' into transliterate ... # Conflicts: # OsmAnd-java/src/main/java/net/osmand/data/MapObject.java		2021-04-20 11:30:22 +03:00
..
main/java	Merge branch 'master' into transliterate	2021-04-20 11:30:22 +03:00
test	Fix #11376	2021-04-19 20:10:27 +02:00