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

fixed merge conflicts.

Browse source
This commit is contained in:
Peter 'Pita' Martischka 2011-05-16 16:28:58 +01:00
commit 89fdd0a9b9
6 changed files with 167 additions and 226 deletions
Download patch file Download diff file Expand all files Collapse all files

2
node/server.js
View file

@ -23,6 +23,8 @@ var http = require('http')
, db = require('./db')
, async = require('async');
require('joose');
async.waterfall([
function (callback)
{