diff options
| author | Tim Smith <tsmith@chef.io> | 2017-09-06 12:56:52 -0700 |
|---|---|---|
| committer | Tim Smith <tsmith@chef.io> | 2017-09-06 12:56:52 -0700 |
| commit | eb7c9a6c972fad90c791a442ff76740d76dab8cd (patch) | |
| tree | 16aa97ff56102cfcc02d97bf63d9a7bbdf976310 /lib/chef/version.rb | |
| parent | e7087b7262be78ea29dd6ec7da00f3a94d5e894e (diff) | |
| parent | 074034d5edafff481b94df0b0e6562c3c27a22c0 (diff) | |
| download | chef-eb7c9a6c972fad90c791a442ff76740d76dab8cd.tar.gz | |
Merge branch 'master' into tm/13_4
# Conflicts:
# RELEASE_NOTES.md
Diffstat (limited to 'lib/chef/version.rb')
0 files changed, 0 insertions, 0 deletions