public-offering
/
pad.pub0.org
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:ether/etherpad-lite into develop

pull/2299/head
John McLear 2014-11-01 21:12:53 +00:00
parent 9b8398d0bd ff549db261
commit 1530757d8e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/node/utils/ImportHtml.js
View File

@ -14,10 +14,8 @@
* limitations under the License. * limitations under the License.
*/ */
var jsdom = require('jsdom-nocontextifiy').jsdom; var jsdom = require('jsdom').jsdom;
var log4js = require('log4js'); var log4js = require('log4js');
var Changeset = require("ep_etherpad-lite/static/js/Changeset"); var Changeset = require("ep_etherpad-lite/static/js/Changeset");
var contentcollector = require("ep_etherpad-lite/static/js/contentcollector"); var contentcollector = require("ep_etherpad-lite/static/js/contentcollector");

2
src/package.json
View File

@ -25,7 +25,7 @@
"formidable" : "1.0.9", "formidable" : "1.0.9",
"log4js" : "0.6.6", "log4js" : "0.6.6",
"nodemailer" : "0.3.x", "nodemailer" : "0.3.x",
"jsdom-nocontextifiy" : "0.2.10", "jsdom" : ">=1.1.0",
"async-stacktrace" : "0.0.2", "async-stacktrace" : "0.0.2",
"npm" : "1.4.x", "npm" : "1.4.x",
"ejs" : "0.6.1", "ejs" : "0.6.1",