diff options
| author | Vlad Bokov <razum2um@mail.ru> | 2011-11-22 00:20:10 +0700 |
|---|---|---|
| committer | Vlad Bokov <razum2um@mail.ru> | 2011-11-22 00:20:10 +0700 |
| commit | f35aab2070aa5884ac7b82666af81d4375211fe7 (patch) | |
| tree | c2f43f585e18385beef653030c9f961c54f8741a /.gitignore | |
| parent | 4c96420696c5e2000676a5801a32e8630ce8487f (diff) | |
| parent | 14fc18e71f598bb7548848ed0cb840693ae6b9fd (diff) | |
| download | askbot-f35aab2070aa5884ac7b82666af81d4375211fe7.tar.gz askbot-f35aab2070aa5884ac7b82666af81d4375211fe7.tar.bz2 askbot-f35aab2070aa5884ac7b82666af81d4375211fe7.zip | |
Merge branch 'master' into R111_closed_forum_mode
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -26,16 +26,13 @@ tmp/* load askbot/skins/default/media/js/flot askbot/skins/common/media/js/closure/google-closure +askbot/skins/common/media/js/jquery.fancybox-1.3.4 askbot/fixtures *.egg dist *.egg-info build -askbot/upfiles/*.jpg -askbot/upfiles/*.jpeg -askbot/upfiles/*.gif -askbot/upfiles/*.png -askbot/upfiles/*.ico +askbot/upfiles/ askbot/upfiles/avatars/ askbot/skins/common/media/mathjax/ /jinja2 |