diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-08 17:21:47 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-08 17:21:47 +0400 |
| commit | da22119c2ffd14098611b1691dc70110431527b5 (patch) | |
| tree | f1faf8794cc66837b0db813f86666b256e4fa6fb /config | |
| parent | a7627bdc7ae67a5c103f968eea02d6b1cf1ef8da (diff) | |
| parent | d1924926585a477682b8fcc3176521dacb0766dd (diff) | |
| download | pleroma-da22119c2ffd14098611b1691dc70110431527b5.tar.gz pleroma-da22119c2ffd14098611b1691dc70110431527b5.zip | |
Merge branch 'develop' into global-status-expiration
Diffstat (limited to 'config')
| -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 9940fcfe9..7a70164f3 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, |