merge

sparcs-kaist · Jul 27, 2015 · 79920f2 · 79920f2
1 parent 0ab3e8a
commit 79920f2
Show file tree

Hide file tree

Showing 21 changed files with 1,074 additions and 761 deletions.
diff --git a/.gitignore b/.gitignore
@@ -51,6 +51,10 @@ coverage.xml
 *.log
 migrations/
 
+# node.js / npm
+node_modules/
+npm-debug.log
+
 # Sphinx documentation
 docs/_build/
 
@@ -62,3 +66,6 @@ target/
 
 # SQLITE3 Test database
 db.*
+
+# Mac OS Env
+.DS_Store
diff --git a/apps/board/admin.py b/apps/board/admin.py
@@ -9,6 +9,3 @@
 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)