merge

2019-06-19 13:47:58 +01:00
parent ca0a6f6ef9 d653b3715f
commit 1d89759c49
21 changed files with 8130 additions and 6851 deletions
--- a/apps/token/arapp.json
+++ b/apps/token/arapp.json
@@ -9,7 +9,7 @@
  "environments": {
    "default": {
      "network": "development",
-      "appName": "kredits-token.aragonpm.eth"
+      "appName": "kredits-token.open.aragonpm.eth"
    },
    "rinkeby": {
      "registry": "0x98df287b6c145399aaa709692c8d308357bc085d",
--- a/apps/token/package-lock.json
+++ b/apps/token/package-lock.json
--- a/apps/token/package.json
+++ b/apps/token/package.json
@@ -3,8 +3,8 @@
  "version": "1.0.0",
  "description": "",
  "dependencies": {
-    "@aragon/os": "^4.1.0",
-    "@aragon/cli": "^5.5.0"
+    "@aragon/os": "^4.2.0",
+    "@aragon/cli": "^5.9.6"
  },
  "devDependencies": {
    "@aragon/test-helpers": "^1.1.0",