Merge remote-tracking branch 'upstream/master' into shared-worker

ipfs · Jul 20, 2020 · f462640 · f462640
2 parents 69c6db0 + d24e34c
commit f462640
Show file tree

Hide file tree

Showing 174 changed files with 2,868 additions and 1,274 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -135,7 +135,7 @@ jobs:
         - npx json -I -f ./lerna.json -e "this.command.bootstrap.nohoist.push('ipfs-css', 'tachyons')"
         - npm run reset
         - npm install
-        - npm run build -- $RUN_SINCE --scope={ipfs,ipfs-http-client}
+        - npm run build -- --scope={ipfs,ipfs-http-client}
         - npm run test -- --scope=example* --concurrency=1
 
     - stage: release-rc-npm

diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@
   <br>
 </p>
 
-> **Upgrading from <=0.40 to 0.41?** See the [release notes](https://github.com/ipfs/js-ipfs/issues/2656) for the list of API changes and the [migration guide](https://gist.github.com/alanshaw/04b2ddc35a6fff25c040c011ac6acf26).
+> **Upgrading from <=0.40 to 0.48?** See the [release notes](https://github.com/ipfs/js-ipfs/issues/2656) for the list of API changes and the [migration guide](https://github.com/ipfs/js-ipfs/tree/master/docs/docs/MIGRATION-TO-ASYNC-AWAIT.md).
 
 We've come a long way, but this project is still in Alpha, lots of development is happening, APIs might change, beware of 🐉..
 
@@ -46,6 +46,7 @@ We've come a long way, but this project is still in Alpha, lots of development i
 
 ## Documentation
 
+* [Config](./docs/CONFIG.md)
 * [Core API](./docs/core-api)
 * [Examples](./examples)
 * [Development](./docs/DEVELOPMENT.md)