Merge branch '1.x' into 1.x

Author: holgerd77

.travis.yml

@@ -23,8 +23,6 @@ matrix:
     - node_js: 12
       env: TEST=e2e_windows
       os: windows
-    - node_js: 10
-      env: TEST=e2e_ens
     - node_js: 10
       env: TEST=e2e_browsers
       addons:

CHANGELOG.md

@@ -152,3 +152,4 @@ Released with 1.0.0-beta.37 code base.
 
 - Add missing subscription.on('connected') TS type definition (#3319)
 - Add missing bignumber.js dependency for TS types (#3386)
+- Upgrade swarm-js to 0.1.40 to remove npm vulnerability warning (#3399)

package.json

@@ -47,7 +47,6 @@
         "test:e2e:publish": "./scripts/e2e.npm.publish.sh",
         "test:e2e:truffle": "./scripts/e2e.truffle.sh",
         "test:e2e:mosaic": "./scripts/e2e.mosaic.sh",
-        "test:e2e:ens": "./scripts/e2e.ens.sh",
         "test:e2e:ganache:core": "./scripts/e2e.ganache.core.sh",
         "ci": "./scripts/ci.sh",
         "coveralls": "./scripts/coveralls.sh",