Merge remote-tracking branch 'origin/app_profiles' into app_profiles
# Conflicts: # OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java
This commit is contained in:
commit
3c81d0a147
# Conflicts: # OsmAnd/src/net/osmand/plus/profiles/EditProfileFragment.java