diff options
| author | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
|---|---|---|
| committer | Egor Kislitsyn <egor@kislitsyn.com> | 2020-06-02 18:50:37 +0400 |
| commit | 68cb152a0861618035ac48a0e0b455f74d9b767c (patch) | |
| tree | cb2f14ed088efa0ab5b6952ee7d74d69f524387a /config/config.exs | |
| parent | cbcd592300673582e38d0bf539dcdb9a2c1985a1 (diff) | |
| parent | 879304dcd94c778b3cdaa2b82f69fccf2b37090c (diff) | |
| download | pleroma-68cb152a0861618035ac48a0e0b455f74d9b767c.tar.gz pleroma-68cb152a0861618035ac48a0e0b455f74d9b767c.zip | |
Merge branch 'develop' into openapi/admin/relay
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/config/config.exs b/config/config.exs index 7385fb6c3..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, @@ -274,7 +275,7 @@ config :pleroma, :markup, config :pleroma, :frontend_configurations, pleroma_fe: %{ alwaysShowSubjectInput: true, - background: "/static/aurora_borealis.jpg", + background: "/images/city.jpg", collapseMessageWithSubject: false, disableChat: false, greentext: false, |