diff options
| author | jessib <jessib@leap.se> | 2012-12-18 13:47:46 -0800 |
|---|---|---|
| committer | jessib <jessib@leap.se> | 2012-12-18 13:47:46 -0800 |
| commit | af5fc4b6b89583d81d5e495cd778d7e3b41dc828 (patch) | |
| tree | 56153e7c967882cd04712c1e2e69fc9231373fac /.gitignore | |
| parent | 05fd50e769e00e2f63eb4e0eae44ecbc47a6606a (diff) | |
| parent | e899e5c3f33acb3228fac295013d7cc8b6e4eb04 (diff) | |
Merge branch 'master' into feature/tickets-refactor
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -21,3 +21,8 @@ Gemfile.lock */Gemfile.lock test/dummy/log/* test/dummy/tmp/* +config/couchdb.yml +public/assets/* +public/ca.crt +public/config/* +public/provider.json |