diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-16 10:20:39 -0300 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2012-01-16 10:20:39 -0300 |
commit | 03f752ba7f0b6398cfd4712654b5a6b348f73e2f (patch) | |
tree | a1fde5880db4d0da360cda7de6c886dfa7cd1360 /.gitignore | |
parent | 76568d4c401c1787d21637fd0f7e944ae8ce200b (diff) | |
parent | 3035bd461f02ff238ddcede43ccea428fd03c20c (diff) | |
download | askbot-03f752ba7f0b6398cfd4712654b5a6b348f73e2f.tar.gz askbot-03f752ba7f0b6398cfd4712654b5a6b348f73e2f.tar.bz2 askbot-03f752ba7f0b6398cfd4712654b5a6b348f73e2f.zip |
merged the master branch
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -5,6 +5,7 @@ db rebuild-locales.pl /src +/static cache/?? run *.wsgi @@ -15,6 +16,7 @@ settings.py *.iml lint env +/static django django/* nbproject @@ -42,4 +44,4 @@ askbot/skins/common/media/mathjax/ run recaptcha /.ve -/db.sq3
\ No newline at end of file +/db.sq3 |