diff options
| author | feld <feld@feld.me> | 2024-06-20 01:07:41 +0000 |
|---|---|---|
| committer | feld <feld@feld.me> | 2024-06-20 01:07:41 +0000 |
| commit | 9a4cdde5c9e833a8cc61d660f5627717756778d2 (patch) | |
| tree | 0a1b2a55743c2e00f32c7549fc4bf68b0ea3c894 /docs | |
| parent | 3c1db78a6e8dc3cf9087ba5f825d53d5c6a9856d (diff) | |
| parent | ed2976b237b53a524247d564691e0a12d3231d68 (diff) | |
| download | pleroma-9a4cdde5c9e833a8cc61d660f5627717756778d2.tar.gz pleroma-9a4cdde5c9e833a8cc61d660f5627717756778d2.zip | |
Merge branch 'bugfix/elixir-1.15' into 'develop'
Elixir 1.15 compatibility
See merge request pleroma/pleroma!3917
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration/cheatsheet.md | 4 | ||||
| -rw-r--r-- | docs/installation/generic_dependencies.include | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/configuration/cheatsheet.md b/docs/configuration/cheatsheet.md index bb6e5d279..9c5659988 100644 --- a/docs/configuration/cheatsheet.md +++ b/docs/configuration/cheatsheet.md @@ -853,7 +853,7 @@ config :logger, backends: [{ExSyslogger, :ex_syslogger}] config :logger, :ex_syslogger, - level: :warn + level: :warning ``` Another example, keeping console output and adding the pid to syslog output: @@ -862,7 +862,7 @@ config :logger, backends: [:console, {ExSyslogger, :ex_syslogger}] config :logger, :ex_syslogger, - level: :warn, + level: :warning, option: [:pid, :ndelay] ``` diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include index 666f49fbb..bdb7f94d3 100644 --- a/docs/installation/generic_dependencies.include +++ b/docs/installation/generic_dependencies.include @@ -1,7 +1,7 @@ ## Required dependencies * PostgreSQL >=11.0 -* Elixir >=1.13.0 <1.15 +* Elixir >=1.13.0 <1.17 * Erlang OTP >=22.2.0 (supported: <27) * git * file / libmagic |