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
Showing
- assets/vendor.js 3 additions, 4 deletionsassets/vendor.js
- hiboo/application/templates/application_pick.html 1 addition, 1 deletionhiboo/application/templates/application_pick.html
- hiboo/profile/templates/profile_pick.html 13 additions, 11 deletionshiboo/profile/templates/profile_pick.html
- hiboo/profile/templates/profile_quick.html 7 additions, 5 deletionshiboo/profile/templates/profile_quick.html
- hiboo/sso/oidc.py 1 addition, 1 deletionhiboo/sso/oidc.py
- hiboo/templates/macros.html 1 addition, 1 deletionhiboo/templates/macros.html
Loading
Please register or sign in to comment