Merge remote-tracking branch 'origin/master'
# Conflicts: # app/static/scripts/others/users.js # app/templates/util/new_user.html
This commit is contained in:
commit
c9f711b2fb
# Conflicts: # app/static/scripts/others/users.js # app/templates/util/new_user.html