aboutsummaryrefslogtreecommitdiffhomepage
path: root/package.json
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-27 16:12:41 +0200
committerChocobozzz <me@florianbigard.com>2021-05-27 16:12:41 +0200
commit8f608a4cb22ab232cfab20665050764b38bac9c7 (patch)
tree6a6785aae79bf5939ad7b7a50a1bd8031268d2b4 /package.json
parent030ccfce59a8cb8f2fee6ea8dd363ba635c5c5c2 (diff)
parentc215e627b575d2c4085ccb222f4ca8d0237b7552 (diff)
downloadPeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.gz
PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.tar.zst
PeerTube-8f608a4cb22ab232cfab20665050764b38bac9c7.zip
Merge branch 'develop' into shorter-URLs-channels-accounts
Diffstat (limited to 'package.json')
-rw-r--r--package.json10
1 files changed, 4 insertions, 6 deletions
diff --git a/package.json b/package.json
index b5c374145..c148cedb2 100644
--- a/package.json
+++ b/package.json
@@ -1,15 +1,12 @@
1{ 1{
2 "name": "peertube", 2 "name": "peertube",
3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.", 3 "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
4 "version": "3.1.0", 4 "version": "3.2.0",
5 "private": true, 5 "private": true,
6 "licence": "AGPL-3.0", 6 "licence": "AGPL-3.0",
7 "engines": { 7 "engines": {
8 "node": ">=10.x", 8 "node": ">=12.x",
9 "yarn": ">=1.x", 9 "yarn": ">=1.x"
10 "postgres": ">=10.x",
11 "redis-server": ">=2.8.18",
12 "ffmpeg": ">=4.1"
13 }, 10 },
14 "bin": { 11 "bin": {
15 "peertube": "dist/server/tools/peertube.js" 12 "peertube": "dist/server/tools/peertube.js"
@@ -76,6 +73,7 @@
76 "swagger-cli": "swagger-cli" 73 "swagger-cli": "swagger-cli"
77 }, 74 },
78 "dependencies": { 75 "dependencies": {
76 "@uploadx/core": "^4.4.0",
79 "apicache": "1.6.2", 77 "apicache": "1.6.2",
80 "async": "^3.0.1", 78 "async": "^3.0.1",
81 "async-lru": "^1.1.1", 79 "async-lru": "^1.1.1",