Merge branch 'master' into feature/25-ipfs_cluster

2018-10-26 16:46:44 +02:00
parent 1f528a832d 4dff379065
commit 4a42fc4ae3
12 changed files with 105 additions and 40 deletions
--- a/nodes/dev.kosmos.org.json
+++ b/nodes/dev.kosmos.org.json
@@ -9,7 +9,6 @@
    "5apps-xmpp_server",
    "5apps-hubot::xmpp_schlupp",
    "5apps-hubot::xmpp_botka",
-    "kosmos-ipfs",
    "kosmos-mastodon",
    "kosmos-mastodon::nginx"
  ],