Merge branch 'master' into harmony-v3.1.5

2017-10-22 00:35:00 +08:00
parent f9c57dfee0 96439ca246
commit c60fa67827
4 changed files with 533 additions and 65 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.4",
+  "version": "3.1.5",
  "engines": {
    "node": ">=0.8.0"
  },