summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-04 15:47:34 +0100
committerAzul <azul@leap.se>2012-11-04 15:47:34 +0100
commit675b626378fcaad6bca2abfd7086ca05fa17f76f (patch)
treebd9e14dd52e109d03786014b7a0e38ba870bcc87 /.gitignore
parent023d91a7ad605a9f941ad36c5d002172b25387a3 (diff)
parent872b9fa6759d5708f5efb19ba46b3c8e2b5d4862 (diff)
Merge branch 'feature-admin_users' into 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