diff options
| author | marcin mikołajczak <me@mkljczk.pl> | 2024-01-19 16:36:37 +0000 |
|---|---|---|
| committer | marcin mikołajczak <me@mkljczk.pl> | 2024-01-19 16:36:37 +0000 |
| commit | 250a4873a6f50f71cb5c387de46d711dc1bd1a39 (patch) | |
| tree | 15364aea4ca2ad364517099f090716de0900b8ef /docs/installation/generic_dependencies.include | |
| parent | 51aef6b78dcf709872de32a02533e943f08858d4 (diff) | |
| parent | 81a13b4b9eb066e7827251c054eb04fd70613532 (diff) | |
| download | pleroma-250a4873a6f50f71cb5c387de46d711dc1bd1a39.tar.gz pleroma-250a4873a6f50f71cb5c387de46d711dc1bd1a39.zip | |
Merge branch 'develop' into 'post-languages'
# Conflicts:
# lib/pleroma/web/activity_pub/transmogrifier.ex
# test/pleroma/web/activity_pub/transmogrifier/note_handling_test.exs
Diffstat (limited to 'docs/installation/generic_dependencies.include')
| -rw-r--r-- | docs/installation/generic_dependencies.include | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include index 3365a36a8..aebf21e7c 100644 --- a/docs/installation/generic_dependencies.include +++ b/docs/installation/generic_dependencies.include @@ -2,7 +2,7 @@ * PostgreSQL >=9.6 * Elixir >=1.11.0 <1.15 -* Erlang OTP >=22.2.0 <26 +* Erlang OTP >=22.2.0 (supported: <27) * git * file / libmagic * gcc or clang |