aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorChocobozzz <florian.bigard@gmail.com>2016-10-07 10:10:00 +0200
committerChocobozzz <florian.bigard@gmail.com>2016-10-07 10:10:00 +0200
commitaff36eb063573532498979c83be1c279c84f2d53 (patch)
tree3f79dc7373689f0493e80a6e501225fd0cd7aa26 /package.json
parentc3117f13d599f37693f937865b6e84eb1f72d5c4 (diff)
parenta6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (diff)
downloadPeerTube-aff36eb063573532498979c83be1c279c84f2d53.tar.gz
PeerTube-aff36eb063573532498979c83be1c279c84f2d53.tar.zst
PeerTube-aff36eb063573532498979c83be1c279c84f2d53.zip
Merge branch 'webseed'
Diffstat (limited to 'package.json')
-rw-r--r--package.json6
1 files changed, 3 insertions, 3 deletions
diff --git a/package.json b/package.json
index 9a844baaf..59c7a4332 100644
--- a/package.json
+++ b/package.json
@@ -40,27 +40,27 @@
40 "body-parser": "^1.12.4", 40 "body-parser": "^1.12.4",
41 "concurrently": "^2.0.0", 41 "concurrently": "^2.0.0",
42 "config": "^1.14.0", 42 "config": "^1.14.0",
43 "create-torrent": "^3.24.5",
43 "debug": "^2.2.0", 44 "debug": "^2.2.0",
44 "dezalgo": "^1.0.3", 45 "dezalgo": "^1.0.3",
45 "electron-spawn": "https://github.com/Chocobozzz/electron-spawn",
46 "express": "^4.12.4", 46 "express": "^4.12.4",
47 "express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server", 47 "express-oauth-server": "https://github.com/Chocobozzz/express-oauth-server",
48 "express-validator": "^2.11.0", 48 "express-validator": "^2.11.0",
49 "fluent-ffmpeg": "^2.1.0", 49 "fluent-ffmpeg": "^2.1.0",
50 "js-yaml": "^3.5.4", 50 "js-yaml": "^3.5.4",
51 "lodash": "^4.11.1", 51 "lodash": "^4.11.1",
52 "magnet-uri": "^5.1.4",
52 "mkdirp": "^0.5.1", 53 "mkdirp": "^0.5.1",
53 "mongoose": "^4.0.5", 54 "mongoose": "^4.0.5",
54 "morgan": "^1.5.3", 55 "morgan": "^1.5.3",
55 "multer": "^1.1.0", 56 "multer": "^1.1.0",
56 "node-ipc": "8.9.0",
57 "openssl-wrapper": "^0.3.4", 57 "openssl-wrapper": "^0.3.4",
58 "parse-torrent": "^5.8.0",
58 "password-generator": "^2.0.2", 59 "password-generator": "^2.0.2",
59 "request": "^2.57.0", 60 "request": "^2.57.0",
60 "request-replay": "^1.0.2", 61 "request-replay": "^1.0.2",
61 "scripty": "^1.5.0", 62 "scripty": "^1.5.0",
62 "ursa": "^0.9.1", 63 "ursa": "^0.9.1",
63 "webtorrent": "^0.96.0",
64 "winston": "^2.1.1", 64 "winston": "^2.1.1",
65 "ws": "^1.1.1" 65 "ws": "^1.1.1"
66 }, 66 },