diff options
| author | John McLear <john@mclear.co.uk> | 2012-04-20 16:21:04 -0700 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2012-04-20 16:21:04 -0700 |
| commit | 3798f53f942db0920aee79b401c970791b0fee8c (patch) | |
| tree | 4d2772fefac6eb82fbbd2f5d73dcb6bbbe68397e /src/package.json | |
| parent | 16edda7d46ffbe277d505e71f54cda1da2f00452 (diff) | |
| parent | d08f3ff5ee5bf688131d1b40694eedb718e3d2c8 (diff) | |
| download | etherpad-lite-3798f53f942db0920aee79b401c970791b0fee8c.zip | |
Merge pull request #660 from redhog/master
Unbreak last pull request (I forgot a dependency)
Diffstat (limited to 'src/package.json')
| -rw-r--r-- | src/package.json | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/package.json b/src/package.json index 16076e1d..19725e7d 100644 --- a/src/package.json +++ b/src/package.json @@ -13,6 +13,7 @@ "yajsml" : "1.1.2", "request" : "2.9.100", "require-kernel" : "1.0.5", + "resolve" : "0.2.1", "socket.io" : "0.8.7", "ueberDB" : "0.1.7", "async" : "0.1.18", |