Commit a06ae5c9 authored by ynerant's avatar ynerant

Merge remote-tracking branch 'origin/master' into master

# Conflicts:
#	media/admin.py
#	users/admin.py
#	users/views.py
parents 796c985f dc4cb56d
Pipeline #4117 passed with stages
in 5 minutes and 7 seconds