summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-01-26 23:17:13 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2012-01-26 23:17:13 -0300
commitf34d72018f9eb9dc8b3d5bf314477ab601d7fee5 (patch)
tree3459a0bdbd0dffae04666c5210c0ee49e732c04e /.gitignore
parentf52cd99b1abc88950c12d4b3fd47ade316ef6f81 (diff)
parentc9b50fd4536e6da56d28a0d53a4ce1b634c739e9 (diff)
downloadaskbot-f34d72018f9eb9dc8b3d5bf314477ab601d7fee5.tar.gz
askbot-f34d72018f9eb9dc8b3d5bf314477ab601d7fee5.tar.bz2
askbot-f34d72018f9eb9dc8b3d5bf314477ab601d7fee5.zip
Merge branch 'github-master'
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index dc9e2f72..586c4c8a 100755
--- a/.gitignore
+++ b/.gitignore
@@ -27,6 +27,7 @@ tmp/*
/manage.py
/urls.py
/log
+/prof
load
askbot/skins/default/media/js/flot
askbot/skins/common/media/js/closure/google-closure