Merge remote-tracking branch 'origin/master'

# Conflicts:
#	OsmAnd/res/values/strings.xml
This commit is contained in:
madwasp79 2019-07-10 15:25:57 +03:00
commit 5277b156df

Diff content is not available