diff options
author | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-10 16:36:38 -0700 |
---|---|---|
committer | Claire McQuin <mcquin@users.noreply.github.com> | 2014-06-10 16:36:38 -0700 |
commit | 73829b21e61b13bb42d9e3243d1f0b1e01944ed7 (patch) | |
tree | 9a2cc8693c78f9d9f8cdb95688dd4aa3bed169f9 /.gitignore | |
parent | 22cda22e26430c7f0a6508d80a5acbfdc99ad4e9 (diff) | |
parent | c7c6c34715bda9231a42553674d72c5c6b2e05ef (diff) | |
download | chef-73829b21e61b13bb42d9e3243d1f0b1e01944ed7.tar.gz |
Merge pull request #1480 from opscode/mcquin/merges-06-10-2014
update for merges
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions