summaryrefslogtreecommitdiff
path: root/docs/installation/generic_dependencies.include
diff options
context:
space:
mode:
authorHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-12-23 17:43:21 +0000
committerHaelwenn <contact+git.pleroma.social@hacktivis.me>2022-12-23 17:43:21 +0000
commitf76c1d4f70fdda6da621a46fb75891e68e266946 (patch)
tree328aec763c24b6426decd30fe3b6a4674510bbee /docs/installation/generic_dependencies.include
parentd8e326467c30b95c5164f6e29512057dce3c2077 (diff)
parent91c22637de5f1683a32207a606c33e7ef3b84676 (diff)
downloadpleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.tar.gz
pleroma-f76c1d4f70fdda6da621a46fb75891e68e266946.zip
Merge branch 'release/2.5.0' into 'stable'
Release 2.5.0 See merge request pleroma/pleroma!3816
Diffstat (limited to 'docs/installation/generic_dependencies.include')
-rw-r--r--docs/installation/generic_dependencies.include4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include
index baed19de0..dcaacfdfd 100644
--- a/docs/installation/generic_dependencies.include
+++ b/docs/installation/generic_dependencies.include
@@ -1,7 +1,7 @@
## Required dependencies
* PostgreSQL 9.6+
-* Elixir 1.9+
+* Elixir 1.10+
* Erlang OTP 22.2+
* git
* file / libmagic
@@ -9,7 +9,7 @@
* GNU make
* CMake
-## Optionnal dependencies
+## Optional dependencies
* ImageMagick
* FFmpeg