diff options
author | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-02 13:47:01 -0600 |
---|---|---|
committer | Adolfo Fitoria <adolfo.fitoria@gmail.com> | 2012-08-02 13:47:01 -0600 |
commit | 4f6a78f465de5b439ece14ffea79351572dbb75d (patch) | |
tree | a77b7949c4a16cd7225d95ca91e75245f9097c1e /.gitignore | |
parent | a303250bfd22f80c90a3bcc7f5ceb8b06e8bdbb1 (diff) | |
parent | 2a9fd69d2f53bff4130fc67badced33b52b4aa2b (diff) | |
download | askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.tar.gz askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.tar.bz2 askbot-4f6a78f465de5b439ece14ffea79351572dbb75d.zip |
Merge branch 'master' into django1.4
Conflicts:
askbot/feed.py
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 8 |
1 files changed, 8 insertions, 0 deletions
@@ -1,9 +1,11 @@ *.pyc *.swp *.log +*~ db rebuild-locales.pl /src +/static cache/?? run *.wsgi @@ -14,7 +16,9 @@ settings.py *.iml lint env +/static django +lamson django/* nbproject pip-log.txt @@ -24,6 +28,7 @@ tmp/* /manage.py /urls.py /log +/prof load askbot/skins/default/media/js/flot askbot/skins/common/media/js/closure/google-closure @@ -40,3 +45,6 @@ askbot/skins/common/media/mathjax/ *.tar.tz run recaptcha +/.ve +/db.sq3 +*.DS_Store |