projects
/
akkoma
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from parent 2:
b9e6ad5
)
Merge branch 'develop' into activation-meta
author
Mark Felder
<feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000
(15:09 -0500)
committer
Mark Felder
<feld@FreeBSD.org>
Tue, 30 Jun 2020 20:09:03 +0000
(15:09 -0500)
lib/pleroma/web/mastodon_api/views/instance_view.ex
patch
|
blob
|
history
diff --git
a/lib/pleroma/web/mastodon_api/views/instance_view.ex
b/lib/pleroma/web/mastodon_api/views/instance_view.ex
index 35c2fc25cf06314defc2a101d204aecf2391b27c..118678962ba6febfa8835f085b57fead29e4aa45 100644
(file)
--- a/
lib/pleroma/web/mastodon_api/views/instance_view.ex
+++ b/
lib/pleroma/web/mastodon_api/views/instance_view.ex
@@
-36,6
+36,7
@@
defmodule Pleroma.Web.MastodonAPI.InstanceView do
background_image: Keyword.get(instance, :background_image),
pleroma: %{
metadata: %{
+ account_activation_required: Keyword.get(instance, :account_activation_required),
features: features(),
federation: federation()
},