diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-07-02 05:41:34 +0800 |
| commit | 1494cc5e6c5943095c89e3b243b0a6152876e72c (patch) | |
| tree | e34e74e79e8d41ce5903cc8d6eedf5caa19bc354 /package.json | |
| parent | 6e563acd93cbaf20fb233a267104fc6af3384287 (diff) | |
| parent | b2e64f24ecbc9e309869e678254cf755ffe11b40 (diff) | |
| download | tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.gz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.bz2 tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.lz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.xz tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.tar.zst tangerine-wallet-browser-1494cc5e6c5943095c89e3b243b0a6152876e72c.zip | |
fix merge conflicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 6f1671368..85bdacfe1 100644 --- a/package.json +++ b/package.json @@ -46,8 +46,6 @@ "disc": "gulp disc --debug", "announce": "node development/announcer.js", "version:bump": "node development/run-version-bump.js", - "generateNotice": "node notices/notice-generator.js", - "deleteNotice": "node notices/notice-delete.js", "storybook": "start-storybook -p 6006 -c .storybook" }, "browserify": { @@ -186,6 +184,7 @@ "semaphore": "^1.0.5", "semver": "^5.4.1", "shallow-copy": "0.0.1", + "superstatic": "^5.0.2", "sw-controller": "^1.0.3", "sw-stream": "^2.0.2", "textarea-caret": "^3.0.1", @@ -254,6 +253,7 @@ "gulp-util": "^3.0.7", "gulp-watch": "^5.0.0", "gulp-zip": "^4.0.0", + "http-server": "^0.11.1", "image-size": "^0.6.2", "isomorphic-fetch": "^2.2.1", "jsdoc": "^3.5.5", |