diff options
| author | elijah <elijah@riseup.net> | 2016-10-05 14:35:56 -0700 |
|---|---|---|
| committer | elijah <elijah@riseup.net> | 2016-10-05 14:35:56 -0700 |
| commit | 7abfbd6abae14fa6a72350f7b75268ff561354ee (patch) | |
| tree | af5c969c905a8d2a95f2b2aa7c4dd6f4b8763126 /.gitignore | |
| parent | cc57bc6c0ff99d88f3bfeff1b04297e9b91e6988 (diff) | |
| parent | f95e08ef7d8defbde4a19e138b1ac4ebc9677669 (diff) | |
Merge branch 'develop'
# Conflicts:
# lib/leap_cli/version.rb
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -1,11 +1,6 @@ Gemfile.lock pkg junk -test/provider/hiera -test/provider/files/nodes/ -test/provider/files/ca/ -test/provider/files/ssh/ -test/provider/files/users/ .vagrant Vagrantfile .reviewboardrc |