Skip to content
Snippets Groups Projects
Commit ea0a12f6 authored by Shpuld Shpludson's avatar Shpuld Shpludson
Browse files

Merge branch 'develop' into 'iss-149/profile-fields-setting'

# Conflicts:
#   src/components/settings_modal/tabs/profile_tab.vue
parents bad3dacf bbb91d8a
No related branches found
No related tags found
2 merge requests!12172.1.0 into master,!997Profile fields setting
Showing
with 158 additions and 72 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment