diff options
| author | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
|---|---|---|
| committer | Chocobozzz <florian.bigard@gmail.com> | 2016-10-02 15:39:09 +0200 |
| commit | a6375e69668ea42e19531c6bc68dcd37f3f7cbd7 (patch) | |
| tree | 03204a408d56311692c3528bedcf95d2455e94f2 /package.json | |
| parent | 052937db8a8d282eccdbdf38d487ed8d85d3c0a7 (diff) | |
| parent | c4403b29ad4db097af528a7f04eea07e0ed320d0 (diff) | |
| download | PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.gz PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.tar.zst PeerTube-a6375e69668ea42e19531c6bc68dcd37f3f7cbd7.zip | |
Merge branch 'master' into webseed-merged
Diffstat (limited to 'package.json')
| -rw-r--r-- | package.json | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/package.json b/package.json index 63d014376..59c7a4332 100644 --- a/package.json +++ b/package.json | |||
| @@ -35,6 +35,7 @@ | |||
| 35 | }, | 35 | }, |
| 36 | "dependencies": { | 36 | "dependencies": { |
| 37 | "async": "^2.0.0", | 37 | "async": "^2.0.0", |
| 38 | "bcrypt": "^0.8.7", | ||
| 38 | "bittorrent-tracker": "^8.0.0", | 39 | "bittorrent-tracker": "^8.0.0", |
| 39 | "body-parser": "^1.12.4", | 40 | "body-parser": "^1.12.4", |
| 40 | "concurrently": "^2.0.0", | 41 | "concurrently": "^2.0.0", |
| @@ -59,7 +60,6 @@ | |||
| 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 | "segfault-handler": "^1.0.0", | ||
| 63 | "ursa": "^0.9.1", | 63 | "ursa": "^0.9.1", |
| 64 | "winston": "^2.1.1", | 64 | "winston": "^2.1.1", |
| 65 | "ws": "^1.1.1" | 65 | "ws": "^1.1.1" |
| @@ -67,9 +67,9 @@ | |||
| 67 | "devDependencies": { | 67 | "devDependencies": { |
| 68 | "chai": "^3.3.0", | 68 | "chai": "^3.3.0", |
| 69 | "commander": "^2.9.0", | 69 | "commander": "^2.9.0", |
| 70 | "mocha": "^2.3.3", | 70 | "mocha": "^3.0.1", |
| 71 | "standard": "^7.0.1", | 71 | "standard": "^8.0.0", |
| 72 | "supertest": "^1.1.0" | 72 | "supertest": "^2.0.0" |
| 73 | }, | 73 | }, |
| 74 | "standard": { | 74 | "standard": { |
| 75 | "ignore": [ | 75 | "ignore": [ |