From: lain <lain@soykaf.club>
Date: Tue, 2 Jun 2020 14:10:53 +0000 (+0000)
Subject: Merge branch 'tagline' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=6977500ef7b40193752efb88cc92dcb4954333d6;hp=-c;p=akkoma

Merge branch 'tagline' into 'develop'

Update default instance description

See merge request pleroma/pleroma!2600
---

6977500ef7b40193752efb88cc92dcb4954333d6
diff --combined config/config.exs
index 9a9fbb436,3729526ea..9508ae077
--- a/config/config.exs
+++ b/config/config.exs
@@@ -171,8 -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,
@@@ -184,7 -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,