Merge branch 'master' of https://github.com/filhocf/ideax

filhocf · Apr 5, 2018 · 6b96a39 · 6b96a39
2 parents 63d25d4 + 746f7b2
commit 6b96a39
Show file tree

Hide file tree

Showing 20 changed files with 3,156 additions and 133 deletions.
diff --git a/ideax/admin.py b/ideax/admin.py
@@ -1,4 +1,7 @@
 from django.contrib import admin
-from .models import Idea
+from .models import Idea, UserProfile, Popular_Vote, Comment
 
 admin.site.register(Idea)
+admin.site.register(UserProfile)
+admin.site.register(Popular_Vote)
+admin.site.register(Comment)