Merge branch 'master' of github.com:FinalsClub/karmaworld

[oweals/karmaworld.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index dc0467fb1001a32cc1db703c8f0f57b472de9380..de5e31a4ee0728d78e8c183eb2c13be9a342874e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,9 @@
 *.swo
 *~
 
+# project cruft
+.ropeproject*
+
 # Sphinx docs:
 build
 
@@ -27,6 +30,7 @@ log
 
 # virtual enviroment
 venv
+vkarma
 
 # ignore south migrations
 migrations
@@ -36,3 +40,14 @@ migrations
 local_settings.py
 # uploaded media
 karmaworld/media/
+# collected staticfiles
+karmaworld/static/
+
+## OS X
+# thumbnail cache
+.DS_Store
+
+## Sublime Text 
+*.sublime-project
+*.sublime-workspace
+