diff options
| author | lain <lain@soykaf.club> | 2020-06-02 14:10:53 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-06-02 14:10:53 +0000 |
| commit | 6977500ef7b40193752efb88cc92dcb4954333d6 (patch) | |
| tree | b4b6b27cedc43a61dbdc948365ad798d1c7ef708 | |
| parent | 022d975a39adf62ba7b4bdacd84c78d4341e5132 (diff) | |
| parent | d4a18d44feb4ae67f6476b30fac96c0e6aa511dd (diff) | |
| download | pleroma-6977500ef7b40193752efb88cc92dcb4954333d6.tar.gz | |
Merge branch 'tagline' into 'develop'
Update default instance description
See merge request pleroma/pleroma!2600
| -rw-r--r-- | config/config.exs | 2 | ||||
| -rw-r--r-- | 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 index 9a9fbb436..9508ae077 100644 --- 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 index d5c335d0c..bf39ae643 100644 --- 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, |