Switch back to is.gd

[oweals/karmaworld.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 8628a18cd07e730553a63810502200b1515141b6..685e499aa30ea449c79de66e7655e61c8054e58b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 # Project secret files
 karmaworld/secret/*.py
+karmaworld/secret/*.json
 
 # ignore vagrant virtual machines
 .vagrant
@@ -17,6 +18,7 @@ karmaworld/secret/*.py
 
 # project cruft
 .ropeproject*
+.idea
 
 # Sphinx docs:
 build
@@ -37,9 +39,7 @@ log
 # virtual enviroment
 venv
 vkarma
-
-# ignore south migrations
-migrations
+beta
 
 ## Django
 # deployment specific django files:
@@ -48,6 +48,8 @@ local_settings.py
 karmaworld/media/
 # collected staticfiles
 karmaworld/static/
+# secret things
+karmaworld/secret/*
 
 ## OS X
 # thumbnail cache