summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:08:36 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:08:36 -0600
commitf884ece5b9b32a4ed5701c5a616225038f4cc236 (patch)
treefd1a31f04a866cab270a7c4ea846206782009823 /.gitignore
parent94f11899189d7c5a6a37373531eaa016a5c32ea2 (diff)
parentb3bcd3124c38ce0a7d9c04d48666ad4f273d0345 (diff)
downloadaskbot-f884ece5b9b32a4ed5701c5a616225038f4cc236.tar.gz
askbot-f884ece5b9b32a4ed5701c5a616225038f4cc236.tar.bz2
askbot-f884ece5b9b32a4ed5701c5a616225038f4cc236.zip
Merge branch 'master' of git://github.com/evgenyfadeev/CNPROG into evgenyfadeev/master
Conflicts: forum/auth.py forum/models.py forum/views.py
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 18d3733f..4f83efab 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,3 @@
-settings_local.py
*.pyc
*.swp
nbproject