Merge

2017-05-12 20:04:28 +02:00
parent a1f73b0307 642015700e
commit 859cca3820
14 changed files with 235 additions and 4 deletions
@@ -51,6 +51,7 @@
    "ember-cli-uglify": "^1.2.0",
    "ember-export-application-global": "^1.0.5",
    "ember-load-initializers": "^0.5.1",
+    "ember-parachute": "0.1.0",
    "ember-resolver": "^2.0.3",
    "ipfs-api": "^12.1.7",
    "kredits-contracts": "^2.0.4",