Merge branch 'master' into feature/16-ipfs

2017-03-20 13:27:27 +00:00
parent d52ef53ac8 bcfd44b923
commit 48b3534fd8
345 changed files with 12631 additions and 5506 deletions
--- a/2
+++ b/2
@@ -1,6 +1,6 @@
 source 'https://rubygems.org'

-gem 'chef',   '~> 12.17.44'
+gem 'chef'
 gem 'batali'
 gem 'knife-solo'
 gem 'knife-solo_data_bag'