Merge branch 'master' into harmony

This commit is contained in:
Richard van Velzen 2016-11-29 22:32:49 +01:00
commit 3ee46e91e8

View File

@ -4,7 +4,7 @@
"homepage": "http://lisperator.net/uglifyjs", "homepage": "http://lisperator.net/uglifyjs",
"author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)", "author": "Mihai Bazon <mihai.bazon@gmail.com> (http://lisperator.net/)",
"license": "BSD-2-Clause", "license": "BSD-2-Clause",
"version": "2.7.4", "version": "2.7.5",
"engines": { "engines": {
"node": ">=0.8.0" "node": ">=0.8.0"
}, },