Skip to content
Snippets Groups Projects
Commit bc48d4c3 authored by ornanovitch's avatar ornanovitch
Browse files

Merge branch 'master' into 'adminLTE3-corrections'

# Conflicts:
#   hiboo/account/templates/account_profiles.html
#   hiboo/application/templates/application_synapse/room.html
#   hiboo/application/templates/application_synapse/rooms.html
#   hiboo/application/templates/application_synapse/user.html
#   hiboo/profile/templates/profile_action.html
#   hiboo/profile/templates/profile_details.html
#   hiboo/profile/templates/profile_list.html
#   hiboo/profile/templates/profile_pick.html
#   hiboo/profile/templates/profile_quick.html
#   hiboo/service/templates/service_action.html
#   hiboo/service/templates/service_details.html
#   hiboo/service/templates/service_list.html
#   hiboo/templates/base.html
#   hiboo/user/templates/user_details.html
#   hiboo/user/templates/user_list.html
#   hiboo/user/templates/user_pick.html
parents e1b3a67a 87d47226
No related branches found
No related tags found
Loading
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