Merge remote-tracking branch 'origin/Manage_profile_settings' into Manage_profile_settings

Browse source

# Conflicts:
#	OsmAnd/res/layout/preference_circle_item.xml

...

This commit is contained in:

Dima-1 2019-12-26 14:34:15 +02:00

parent 5f0de26a30 1531ee3bec

commit 42524a8e78

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