From: Chocobozzz <me@florianbigard.com>
Date: Mon, 13 Dec 2021 09:22:05 +0000 (+0100)
Subject: Merge branch 'release/4.0.0' into develop
X-Git-Tag: v4.1.0-rc.1~378
X-Git-Url: https://git.immae.eu/?a=commitdiff_plain;h=fa66c9a601d69f6d57c956a3513e8bbed7ee9616;hp=-c;p=github%2FChocobozzz%2FPeerTube.git

Merge branch 'release/4.0.0' into develop
---

fa66c9a601d69f6d57c956a3513e8bbed7ee9616
diff --combined package.json
index a60e0f8aa,f2906128f..2d342418d
--- a/package.json
+++ b/package.json
@@@ -1,7 -1,7 +1,7 @@@
  {
    "name": "peertube",
    "description": "PeerTube, an ActivityPub-federated video streaming platform using P2P directly in your web browser.",
-   "version": "4.0.0-rc.1",
+   "version": "4.0.0",
    "private": true,
    "licence": "AGPL-3.0",
    "engines": {
@@@ -90,6 -90,7 +90,6 @@@
      "cookie-parser": "^1.4.3",
      "cors": "^2.8.1",
      "create-torrent": "^5.0.0",
 -    "decache": "^4.6.0",
      "deep-object-diff": "^1.1.0",
      "email-templates": "^8.0.3",
      "execa": "^5.1.1",
@@@ -117,7 -118,7 +117,7 @@@
      "markdown-it-emoji": "^2.0.0",
      "memoizee": "^0.4.14",
      "morgan": "^1.5.3",
 -    "multer": "^1.1.0",
 +    "multer": "^1.4.4",
      "node-media-server": "^2.1.4",
      "nodemailer": "^6.0.0",
      "oauth2-server": "3.1.1",