mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-05-05 14:47:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 52

Merge remote branch 'upstream/master' into nice-pad-url

Browse source
This commit is contained in:
Wikinaut 2012-02-07 09:43:53 +01:00
commit 2199d5ebf4
23 changed files with 252 additions and 337 deletions
Download patch file Download diff file Expand all files Collapse all files

3
node/server.js
View file

@ -141,9 +141,6 @@ async.waterfall([
gracefulShutdown();
});
//serve minified files
app.get('/minified/:filename', minify.minifyJS);
//serve static files
app.get('/static/js/require-kernel.js', function (req, res, next) {
res.header("Content-Type","application/javascript; charset: utf-8");