Merge branch 'master' into transliterate

Browse source

# Conflicts:
#	OsmAnd-java/src/main/java/net/osmand/data/MapObject.java

...

This commit is contained in:

Vitaliy 2021-04-20 11:46:12 +03:00

parent 109d9aa1bb 11ddc65409

commit 558c0f5256

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show stats Download patch file Download diff file Expand all files Collapse all files

Diff content is not available