Merge branch 'release/3.1.0' into develop

diff --combined package.json
index 72b95e8426b651a53f9ecb832fda9759c300ef20,5719a116c1a275fb66a622e79ea7e486a7882cbd..574e50e523a4cbec5b96b2a348d407eacec8aa1b
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -7,7 -7,7 +7,7 @@@
    "engines": {
      "node": ">=10.x <=15",
      "yarn": ">=1.x",
-     "postgres": ">=9.6",
+     "postgres": ">=10.x",
      "redis-server": ">=2.8.18",
      "ffmpeg": ">=4.1"
    },
@@@ -53,7 -53,6 +53,7 @@@
      "start:server": "node dist/server --no-client",
      "update-host": "node ./dist/scripts/update-host.js",
      "create-transcoding-job": "node ./dist/scripts/create-transcoding-job.js",
 +    "regenerate-thumbnails": "node ./dist/scripts/regenerate-thumbnails.js",
      "create-import-video-file-job": "node ./dist/scripts/create-import-video-file-job.js",
      "print-transcode-command": "node ./dist/scripts/print-transcode-command.js",
      "test": "scripty",
@@@ -83,6 -82,10 +83,6 @@@
      "swagger-cli": "swagger-cli",
      "sass-lint": "sass-lint"
    },
 -  "resolutions": {
 -    "oauth2-server": "3.1.0-beta.1",
 -    "http-signature": "1.3.5"
 -  },
    "dependencies": {
      "apicache": "1.6.2",
      "async": "^3.0.1",
@@@ -102,12 -105,12 +102,12 @@@
      "deep-object-diff": "^1.1.0",
      "email-templates": "^8.0.3",
      "express": "^4.12.4",
 -    "express-oauth-server": "^2.0.0",
      "express-rate-limit": "^5.0.0",
      "express-validator": "^6.4.0",
      "flat": "^5.0.0",
      "fluent-ffmpeg": "^2.1.0",
      "fs-extra": "^9.0.0",
 +    "got": "^11.8.2",
      "helmet": "^4.1.0",
      "http-signature": "1.3.5",
      "ip-anonymize": "^0.1.0",
@@@ -127,7 -130,7 +127,7 @@@
      "multer": "^1.1.0",
      "node-media-server": "^2.1.4",
      "nodemailer": "^6.0.0",
 -    "oauth2-server": "3.1.0-beta.1",
 +    "oauth2-server": "3.1.1",
      "parse-torrent": "^9.1.0",
      "password-generator": "^2.0.2",
      "pem": "^1.12.3",
@@@ -137,6 -140,7 +137,6 @@@
      "pug": "^3.0.0",
      "redis": "^3.0.2",
      "reflect-metadata": "^0.1.12",
 -    "request": "^2.81.0",
      "sanitize-html": "2.x",
      "scripty": "^2.0.0",
      "sequelize": "6.5.0",