diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-11-25 16:56:08 -0800 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2011-11-25 16:56:08 -0800 |
| commit | 7296913cb0f347f4ea036427eb4e0dcdbaec9814 (patch) | |
| tree | 2ca6d79f237d9a3aa0abf346cd6ca7e51c685660 /package.json | |
| parent | 54b912f352bec8c3c6dced5c5bc9161ba4899366 (diff) | |
| parent | 943f8c4682296c8b5424f1c5cec40a3fbea24195 (diff) | |
| download | etherpad-lite-7296913cb0f347f4ea036427eb4e0dcdbaec9814.zip | |
fixed merge confilicts
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/package.json b/package.json index f1c30caa..78648f0a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,8 @@ "uglify-js" : "1.1.1", "gzip" : "0.1.0", "formidable" : "1.0.7", - "log4js" : "0.3.9" + "log4js" : "0.3.9", + "jsdom" : "0.2.9" }, "version" : "1.0.0" } |