diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-03-25 16:25:28 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-03-25 16:25:28 +0100 |
| commit | a786d8a08bf99f339bf16808f46e160404497ae2 (patch) | |
| tree | 13772d15b3b50c17f40c2e52113fcd19c597a3b1 | |
| parent | 903353d67a8d0fdda8465ed6c57b77a9a5afbe92 (diff) | |
| parent | f6160062f8841c6957a643429fb6926a06e508ee (diff) | |
| download | PeerTube-a786d8a08bf99f339bf16808f46e160404497ae2.tar.gz PeerTube-a786d8a08bf99f339bf16808f46e160404497ae2.tar.zst PeerTube-a786d8a08bf99f339bf16808f46e160404497ae2.zip | |
Merge branch 'release/3.1.0' into develop
| -rw-r--r-- | package.json | 2 | ||||
| -rw-r--r-- | support/doc/dependencies.md | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package.json b/package.json index 72b95e842..574e50e52 100644 --- a/package.json +++ b/package.json | |||
| @@ -7,7 +7,7 @@ | |||
| 7 | "engines": { | 7 | "engines": { |
| 8 | "node": ">=10.x <=15", | 8 | "node": ">=10.x <=15", |
| 9 | "yarn": ">=1.x", | 9 | "yarn": ">=1.x", |
| 10 | "postgres": ">=9.6", | 10 | "postgres": ">=10.x", |
| 11 | "redis-server": ">=2.8.18", | 11 | "redis-server": ">=2.8.18", |
| 12 | "ffmpeg": ">=4.1" | 12 | "ffmpeg": ">=4.1" |
| 13 | }, | 13 | }, |
diff --git a/support/doc/dependencies.md b/support/doc/dependencies.md index 5a159fe3c..0fdbdfc82 100644 --- a/support/doc/dependencies.md +++ b/support/doc/dependencies.md | |||
| @@ -245,7 +245,7 @@ On a fresh install of [FreeBSD](https://www.freebsd.org), new system or new jail | |||
| 245 | ``` | 245 | ``` |
| 246 | pkg | 246 | pkg |
| 247 | pkg update | 247 | pkg update |
| 248 | pkg install -y sudo bash wget git python nginx pkgconf postgresql96-server postgresql96-contrib redis openssl node npm yarn ffmpeg unzip | 248 | pkg install -y sudo bash wget git python nginx pkgconf postgresql13-server postgresql13-contrib redis openssl node npm yarn ffmpeg unzip |
| 249 | ``` | 249 | ``` |
| 250 | 250 | ||
| 251 | 2. Allow users in the wheel group (hope you don't forgot to add your user on wheel group!) to use sudo. | 251 | 2. Allow users in the wheel group (hope you don't forgot to add your user on wheel group!) to use sudo. |