pleroma

commit: 6977500ef7b40193752efb88cc92dcb4954333d6
parent: 022d975a39adf62ba7b4bdacd84c78d4341e5132
Author: lain <lain@soykaf.club>
Date:   Tue,  2 Jun 2020 14:10:53 +0000

Merge branch 'tagline' into 'develop'

Update default instance description

See merge request pleroma/pleroma!2600
Diffstat:
M
config/config.exs
2
+-
M
lib/pleroma/web/api_spec/operations/instance_operation.ex
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/config/config.exs b/config/config.exs
@@ -184,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,
diff --git a/lib/pleroma/web/api_spec/operations/instance_operation.ex b/lib/pleroma/web/api_spec/operations/instance_operation.ex
@@ -137,7 +137,7 @@ defmodule Pleroma.Web.ApiSpec.InstanceOperation do
         "background_upload_limit" => 4_000_000,
         "background_image" => "/static/image.png",
         "banner_upload_limit" => 4_000_000,
-        "description" => "A Pleroma instance, an alternative fediverse server",
+        "description" => "Pleroma: An efficient and flexible fediverse server",
         "email" => "lain@lain.com",
         "languages" => ["en"],
         "max_toot_chars" => 5000,