summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
committerAdolfo Fitoria <fitoria@fitoria-laptop.(none)>2009-08-06 11:09:00 -0600
commit0b39716196977f9a368cfded6a1d05244ca724d0 (patch)
treefd1a31f04a866cab270a7c4ea846206782009823 /.gitignore
parent02409029d958cced911b3b18e025cf495656cb04 (diff)
parent8d5ef067c8c4e7de276d559af67417f5324f9171 (diff)
downloadaskbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.gz
askbot-0b39716196977f9a368cfded6a1d05244ca724d0.tar.bz2
askbot-0b39716196977f9a368cfded6a1d05244ca724d0.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