Merge branch 'tagline' into 'develop'

Update default instance description

See merge request pleroma/pleroma!2600

diff --combined config/config.exs
index 9a9fbb436ac79aef02252559ec623f66a67f4cc8,3729526ea62c6f85a01c803c1d2a6332806e5f8d..9508ae07718a24ddfb906506b150154edaa5527b
--- 1/config/config.exs
--- 2/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,