summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-06-15 20:23:18 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2010-06-15 20:23:18 -0400
commit4e5a03a529e1e216aad971fb34be4871e02b1a5f (patch)
tree6367f2e8731d2760b96bf1cbc18cf5ce968c7d8b /.gitignore
parent1e726b4251ca21b2f14e10332ab3b7dede57db8e (diff)
parentc0c7dbcfe24a7f2d8b4d16d122e278d079c297c6 (diff)
downloadaskbot-4e5a03a529e1e216aad971fb34be4871e02b1a5f.tar.gz
askbot-4e5a03a529e1e216aad971fb34be4871e02b1a5f.tar.bz2
askbot-4e5a03a529e1e216aad971fb34be4871e02b1a5f.zip
merged with branch experimental
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore16
1 files changed, 14 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b5938208..795e011d 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,9 +2,11 @@
*.swp
*.log
cache/??
+run
*.wsgi
nbproject
settings_local.py
+settings.py
.idea
*.iml
env
@@ -12,6 +14,16 @@ nbproject
pip-log.txt
*.zip
tmp/*
+/tmp/
+/__init__.py
+/manage.py
+/urls.py
+/log
load
-forum/skins/default/media/js/flot
-forum/skins/common/media/js/closure/google-closure
+askbot/skins/default/media/js/flot
+askbot/skins/common/media/js/closure/google-closure
+askbot/fixtures
+*.egg
+dist
+*.egg-info
+build