]> zoso.dev Git - buffer.git/commitdiff
Merge branch 'master' into inspect-symbol
authorRenée Kooi <renee@kooi.me>
Tue, 13 Aug 2019 08:24:49 +0000 (10:24 +0200)
committerRenée Kooi <renee@kooi.me>
Tue, 13 Aug 2019 08:24:49 +0000 (10:24 +0200)
1  2 
index.js
package.json

diff --cc index.js
Simple merge
diff --cc package.json
index 15b1edad5d54ffcdacfc759ac382c3ced631eef5,37733f0c50ee5ebf7953c172a062d2f1163072c1..32e3a27519b29a358180004872a4f3501fc1baa4
    ],
    "dependencies": {
      "base64-js": "^1.0.2",
 -    "ieee754": "^1.1.4"
 +    "ieee754": "^1.1.4",
 +    "inspect-custom-symbol": "^1.1.0"
    },
    "devDependencies": {
-     "airtap": "0.0.5",
+     "airtap": "^2.0.3",
      "benchmark": "^2.0.0",
      "browserify": "^16.1.0",
-     "concat-stream": "^1.4.7",
+     "concat-stream": "^2.0.0",
      "hyperquest": "^2.0.0",
      "is-buffer": "^2.0.0",
      "is-nan": "^1.0.1",