mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-22 08:26:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

Merge branch 'develop' of github.com:ether/etherpad-lite into drag-and-drop-between-frames-sandbox

Browse source
This commit is contained in:
John McLear 2016-01-10 14:37:44 +00:00
commit ef9cf974a2
14 changed files with 294 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/node/db/DB.js
View file

@ -19,7 +19,7 @@
* limitations under the License.
*/
var ueberDB = require("ueberDB");
var ueberDB = require("ueberdb2");
var settings = require("../utils/Settings");
var log4js = require('log4js');