diff options
author | Azul <azul@leap.se> | 2012-11-04 15:47:34 +0100 |
---|---|---|
committer | Azul <azul@leap.se> | 2012-11-04 15:47:34 +0100 |
commit | 675b626378fcaad6bca2abfd7086ca05fa17f76f (patch) | |
tree | bd9e14dd52e109d03786014b7a0e38ba870bcc87 /.gitignore | |
parent | 023d91a7ad605a9f941ad36c5d002172b25387a3 (diff) | |
parent | 872b9fa6759d5708f5efb19ba46b3c8e2b5d4862 (diff) |
Merge branch 'feature-admin_users' into develop
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -20,3 +20,6 @@ */Gemfile.lock test/dummy/log/* test/dummy/tmp/* + +# Ignore configuration file. +config/config.yml
\ No newline at end of file |