summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-03-05 19:01:37 -0300
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-03-05 19:01:37 -0300
commit37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd (patch)
tree922e066bfec9f6a95320ee5748ea687ebc72f169 /.gitignore
parent3e0f667226d94ea31a3696a2704d7a9d106acd0e (diff)
parentfb0df1a738d3a9dc01c5b54619f286148532c6ce (diff)
downloadaskbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.tar.gz
askbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.tar.bz2
askbot-37250b7cfe88cbcf22f8ca61fbe1f39d04a4e0cd.zip
Merge branch 'master' into rich-text-comments
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 34a75654..69fad9a8 100755
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,7 @@ run
nbproject
settings_local.py
settings.py
+tinymce
.idea
.coverage
*.iml