summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-04-07 05:37:16 -0400
committerEvgeny Fadeev <evgeny.fadeev@gmail.com>2013-04-07 05:37:16 -0400
commit67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce (patch)
tree4fe5381c2b2a16f994a8bfa6092db70e77e7a52f /.gitignore
parentb03f881b11204b7e0fe323dd9148085ef0dfa35d (diff)
parent60bc578f579d8b5a40e4c040a0bbd6a60e30e950 (diff)
downloadaskbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.gz
askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.tar.bz2
askbot-67c5a4bb63a08c3620e6667f4b0c3a3c61cc61ce.zip
merged with the master branch
Diffstat (limited to '.gitignore')
-rwxr-xr-x.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 69fad9a8..c108ec09 100755
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ tinymce
*.iml
lint
env
+/custom_settings
/static
django
tinymce