Merge branch 'master' into harmony

2017-11-07 04:30:40 +08:00
parent 0c43519097 38bfb73f06
commit e11cec1ab8
7 changed files with 536 additions and 130 deletions
--- a/package.json
+++ b/package.json
@@ -4,7 +4,7 @@
  "homepage": "https://github.com/mishoo/UglifyJS2/tree/harmony",
  "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
  "license": "BSD-2-Clause",
-  "version": "3.1.7",
+  "version": "3.1.8",
  "engines": {
    "node": ">=0.8.0"
  },