diff options
| author | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
|---|---|---|
| committer | tusooa <tusooa@kazv.moe> | 2022-09-05 15:19:34 +0000 |
| commit | f7c20731034f7aa3c72a6dcc312850db27787f7e (patch) | |
| tree | 58c7727f73a0a7184865e45c18b6af5e91c51be5 /docs | |
| parent | f8afba95b20670b5d6e93896ccd27bb3fca003a2 (diff) | |
| parent | 80a2528fd10ca2d07b8d96258a19bd9a8ea747ec (diff) | |
Merge branch 'bump/min-elixir-1.10' into 'develop'
Bump minimum Elixir version to 1.10
See merge request pleroma/pleroma!3741
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/configuration/howto_database_config.md | 2 | ||||
| -rw-r--r-- | docs/installation/generic_dependencies.include | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/configuration/howto_database_config.md b/docs/configuration/howto_database_config.md index ae1462f9b..e5af9097a 100644 --- a/docs/configuration/howto_database_config.md +++ b/docs/configuration/howto_database_config.md @@ -59,7 +59,7 @@ The configuration of Pleroma has traditionally been managed with a config file, Here is an example of a server config stripped down after migration: ``` - use Mix.Config + import Config config :pleroma, Pleroma.Web.Endpoint, url: [host: "cool.pleroma.site", scheme: "https", port: 443] diff --git a/docs/installation/generic_dependencies.include b/docs/installation/generic_dependencies.include index 2dbd93e42..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 |