diff options
| author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-11 11:17:07 -0300 |
|---|---|---|
| committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2011-10-11 11:17:07 -0300 |
| commit | e940ec0492ec587c13847f6254c4d67fa6448333 (patch) | |
| tree | aa8c4fe36defc6cc638f95df3aa21aef743519e5 /.gitignore | |
| parent | c509135b0bc5a4dffb514ded92c4b3d463a630b6 (diff) | |
| parent | 2878e98e6f9ff68d270e88aaace3e70adc4903b9 (diff) | |
| download | askbot-e940ec0492ec587c13847f6254c4d67fa6448333.tar.gz askbot-e940ec0492ec587c13847f6254c4d67fa6448333.tar.bz2 askbot-e940ec0492ec587c13847f6254c4d67fa6448333.zip | |
Merge branch 'master' into feature76
Conflicts:
askbot/skins/default/templates/main_page/javascript.html
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -2,6 +2,7 @@ *.swp *.log db +rebuild-locales.pl cache/?? run *.wsgi |