diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-04 13:28:00 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-04 13:28:00 +0400 |
| commit | b4d5bdd6f1c473280b8b9bbad96e9efecb45b298 (patch) | |
| tree | 6d08f332f7bd1bc20f7bd3904987850173f90af0 /config/config.exs | |
| parent | 06f20e918129b1f434783b64d59b5ae6b4b4ed51 (diff) | |
| parent | d6693a91028ab3ee7865f530f3ad2532542fc2d2 (diff) | |
| download | pleroma-b4d5bdd6f1c473280b8b9bbad96e9efecb45b298.tar.gz pleroma-b4d5bdd6f1c473280b8b9bbad96e9efecb45b298.zip | |
Merge branch 'develop' into openapi/admin/config
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/config/config.exs b/config/config.exs index d15998715..9508ae077 100644 --- a/config/config.exs +++ b/config/config.exs @@ -171,7 +171,8 @@ config :mime, :types, %{ "application/ld+json" => ["activity+json"] } -config :tesla, adapter: Tesla.Adapter.Gun +config :tesla, adapter: Tesla.Adapter.Hackney + # Configures http settings, upstream proxy etc. config :pleroma, :http, proxy_url: nil, @@ -183,7 +184,7 @@ config :pleroma, :instance, name: "Pleroma", email: "example@example.com", notify_email: "noreply@example.com", - description: "A Pleroma instance, an alternative fediverse server", + description: "Pleroma: An efficient and flexible fediverse server", background_image: "/images/city.jpg", limit: 5_000, chat_limit: 5_000, |