diff options
| author | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2015-01-27 15:14:18 -0500 |
| commit | 71123634744b9fe2ec7d6a3e38e9789fd84801e3 (patch) | |
| tree | 1794e812d83facd93b3007c42632c63ddf1eb2fc /.gitignore | |
| parent | 71cb0f4c2c3bf95f62c9f189f5cef155b09a9682 (diff) | |
| parent | 5863ab3901368310186790980aea2b0bf7cecb06 (diff) | |
Merge branch 'master' into leap
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -1,8 +1,9 @@ pkg/ -.DS_Store -metadata.json -coverage/ -spec/fixtures/ Gemfile.lock +vendor/ +spec/fixtures/ +.vagrant/ .bundle/ -vendor/bundle/ +coverage/ +.idea/ +*.iml |