Merge branch 'master' into bugfix/nodejs_update_mastodon_fixes

2019-03-14 09:36:10 +01:00
parent 2bd8bf14e6 e20ad9e6f9
commit 7b6e04ae49
31 changed files with 480 additions and 192 deletions
--- a/2
+++ b/2
@@ -64,4 +64,4 @@ cookbook 'mariadb',                '= 0.3.1'
 cookbook 'mingw',                  '= 2.0.0'
 cookbook 'ipfs',
         git: 'https://github.com/67P/ipfs-cookbook.git',
-         ref: 'master'
+         ref: 'v0.1.2'