Merge branch 'master' into virtual/master
Conflicts: lib/member_builder.js lib/util.js test/test-member_builder-prop.jsclosure/master
commit
3820ee4b07
|
@ -16,7 +16,7 @@
|
|||
|
||||
"dependencies": {},
|
||||
"devDependencies": {
|
||||
"uglify-js": ">=1.0.2"
|
||||
"uglify-js": "<=1.0.2"
|
||||
},
|
||||
|
||||
"licenses": [
|
||||
|
|
Loading…
Reference in New Issue