Skip to content
This repository has been archived by the owner on Apr 19, 2023. It is now read-only.

Commit

Permalink
Merge branch 'develop' into message
Browse files Browse the repository at this point in the history
Conflicts:
	apps/session/models.py
  • Loading branch information
Shavakan committed Jul 29, 2015
2 parents 0d03a37 + 868a598 commit 63d80f8
Show file tree
Hide file tree
Showing 41 changed files with 2,265 additions and 17 deletions.
4 changes: 4 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,10 @@ coverage.xml
*.log
migrations/

# node.js / npm
node_modules/
npm-debug.log

# Sphinx documentation
docs/_build/

Expand Down
11 changes: 11 additions & 0 deletions apps/board/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,14 @@
from django.contrib import admin
from apps.board.models import *

# Register your models here.
admin.site.register(BoardContent)
admin.site.register(BoardPost)
admin.site.register(BoardComment)
admin.site.register(BoardContentVote)
admin.site.register(Board)
admin.site.register(BoardReport)
admin.site.register(BoardCategory)
admin.site.register(BoardPostIs_read)
admin.site.register(BoardContentVoteAdult)
admin.site.register(BoardContentVotePolitical)
Loading

0 comments on commit 63d80f8

Please sign in to comment.