merge fix

2019-08-27 19:27:34 +02:00
parent 84cb6245ef
commit 9a5ba13409
2 changed files with 261 additions and 4 deletions
@@ -26,6 +26,7 @@
    "child-process-promise": "^2.2.1",
    "debug": "^4.1.1",
    "express": "^4.16.4",
+    "frontblock": "^0.14.0",
    "frontblock-generic": "^0.30.1",
    "git-cherrypicker": "0.0.3",
    "git-describe": "^4.0.4",