Merge branch 'master' of https://github.com/osmandapp/Osmand into preferences_improvements

This commit is contained in:
Vitaliy 2020-01-02 09:36:26 +02:00
commit fe53750838