summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-10 22:21:49 -0300
committerAdolfo Fitoria <adolfo.fitoria@gmail.com>2011-10-10 22:21:49 -0300
commitf93a95aa2378cce58c44d06fbd169099ce6f1630 (patch)
tree1c2630c930c23ceb5a06fc93f54c0e449f303543 /.gitignore
parent5d670774fbcf041e75b19f4ff9fe9ac04b1f0d67 (diff)
parent2878e98e6f9ff68d270e88aaace3e70adc4903b9 (diff)
downloadaskbot-f93a95aa2378cce58c44d06fbd169099ce6f1630.tar.gz
askbot-f93a95aa2378cce58c44d06fbd169099ce6f1630.tar.bz2
askbot-f93a95aa2378cce58c44d06fbd169099ce6f1630.zip
Merge branch 'master' into new-template
Conflicts: askbot/locale/es/LC_MESSAGES/django.po
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 0375e009..f4c8a613 100755
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
*.swp
*.log
db
+rebuild-locales.pl
cache/??
run
*.wsgi