summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorjessib <jessib@riseup.net>2012-11-02 11:12:15 -0700
committerjessib <jessib@riseup.net>2012-11-02 11:12:15 -0700
commit4db41d772725387ba36240cf8f3529780e896755 (patch)
tree4c4e0f7651ee100f93273775ec934dba1a934724 /.gitignore
parent8b5f7fb6ef438ef034541d6fb500b5ab7e12f3f2 (diff)
parent872b9fa6759d5708f5efb19ba46b3c8e2b5d4862 (diff)
Merge branch 'feature-admin_users' into help_develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 93547cd..d447b54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,6 @@
*/Gemfile.lock
test/dummy/log/*
test/dummy/tmp/*
+
+# Ignore configuration file.
+config/config.yml \ No newline at end of file