mirror of
https://github.com/ether/etherpad-lite.git
synced 2025-05-05 06:37:10 -04:00
Merge remote branch 'upstream/master' into nice-pad-url
This commit is contained in:
commit
fa1531ad1f
2 changed files with 2 additions and 1 deletions
|
@ -326,6 +326,7 @@ function compressJS(values)
|
|||
var complete = values.join("\n");
|
||||
var ast = jsp.parse(complete); // parse code and get the initial AST
|
||||
ast = pro.ast_mangle(ast); // get a new AST with mangled names
|
||||
ast = pro.ast_squeeze(ast); // get an AST with compression optimizations
|
||||
return pro.gen_code(ast); // compressed code here
|
||||
}
|
||||
|
||||
|
|
|
@ -16,7 +16,7 @@
|
|||
"async" : "0.1.15",
|
||||
"express" : "2.5.0",
|
||||
"clean-css" : "0.2.4",
|
||||
"uglify-js" : "1.1.1",
|
||||
"uglify-js" : "1.2.5",
|
||||
"formidable" : "1.0.7",
|
||||
"log4js" : "0.4.1",
|
||||
"jsdom-nocontextifiy" : "0.2.10",
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue