Merge branch 'develop' into standalone_develop
This commit is contained in:
commit
91ea5ca96a
|
@ -14,4 +14,5 @@ json.province @user.show_location ? @user.province : nil
|
|||
json.city @user.show_location ? @user.city : nil
|
||||
json.custom_department @user.show_department ? @user.custom_department : nil
|
||||
json.super_description @user.show_super_description ? @user.super_description : nil
|
||||
json.show_super_description @user.show_super_description
|
||||
json.description @user.description
|
Loading…
Reference in New Issue