diff options
| author | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-04 17:57:03 +0100 |
| commit | c0f92bf9f481463dcaef6f4b30343130a8910a00 (patch) | |
| tree | 3ba89c6f38d19a7b96a0ef599b7cb6364ba5821f /.gitignore | |
| parent | b92d418ebec6486a9e728c57f38f82d4c3343341 (diff) | |
| parent | 19008253d01fd6d7a864e98a7ae5dc216070aee1 (diff) | |
Merge branch 'develop' into feature-warden-srp
Conflicts:
Gemfile.lock
users/app/controllers/application_controller.rb
users/leap_web_users.gemspec
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -13,9 +13,13 @@ # Ignore all logfiles and tempfiles. /log/*.log /tmp +*~ /pkg /*/pkg /log */Gemfile.lock test/dummy/log/* test/dummy/tmp/* + +# Ignore configuration file. +config/config.yml
\ No newline at end of file |