ynerant/med
1
0
Fork 0
mirror of https://gitlab.crans.org/mediatek/med.git synced 2025-07-09 04:50:20 +02:00
Code Issues Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	media/admin.py
#	users/admin.py
#	users/views.py
This commit is contained in:
Yohann D'ANELLO
2020-09-25 10:28:39 +02:00
parent 796c985ffb dc4cb56dd0
commit a06ae5c9b9
8 changed files with 113 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/admin.py
View File

@ -6,6 +6,7 @@ from django.urls import reverse
from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from reversion.admin import VersionAdmin
from med.admin import admin_site
from .forms import MediaAdminForm