Merge remote-tracking branch 'origin/Manage_profile_settings' into Manage_profile_settings
# Conflicts: # OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java
This commit is contained in:
commit
c6ba5159b7
# Conflicts: # OsmAnd/src/net/osmand/plus/settings/ConfigureProfileFragment.java