Resolve model conflicts

2017-06-07 18:56:52 +03:00
parent bd0522f79a 3ad38051ea
commit 4503c9b4c2
10 changed files with 355 additions and 105 deletions
@@ -1,4 +1,5 @@
 from django.contrib import admin
+from webapp.models import Official, Role
 from webapp.models import Feed, Tag, BaseFeed, Event
 from modeltranslation.admin import TranslationAdmin

@@ -6,3 +7,5 @@ from modeltranslation.admin import TranslationAdmin
 admin.site.register(Feed, TranslationAdmin)
 admin.site.register(Tag, TranslationAdmin)
 admin.site.register(Event, TranslationAdmin)
+admin.site.register(Official)
+admin.site.register(Role)