diff options
| author | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-12-15 09:43:01 -0700 |
|---|---|---|
| committer | Tyler Ball <tyler-ball@users.noreply.github.com> | 2015-12-15 09:43:01 -0700 |
| commit | 0b8e829663122e09aaafcaf21615f9171225a057 (patch) | |
| tree | d3fbad3f7dfc274d4e035746292c222701a80d87 | |
| parent | 828353206144db8163b0942da8cb0e14a0ff2e62 (diff) | |
| parent | 7a55cca9d382d0869907395a2e9a21e772d248ac (diff) | |
| download | chef-zero-0b8e829663122e09aaafcaf21615f9171225a057.tar.gz | |
Merge pull request #180 from chef/fix_pedant_branch
Point chef-server back to master
| -rw-r--r-- | Gemfile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3,7 +3,7 @@ gemspec gem 'rest-client', :github => 'chef/rest-client' -gem 'oc-chef-pedant', :github => 'chef/chef-server', :branch => 'tm/rfc-014-universe' +gem 'oc-chef-pedant', :github => 'chef/chef-server' # gem 'oc-chef-pedant', :path => "../chef-server" |