hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'upstream/develop' into hide-reactions

Browse source
This commit is contained in:
Alex Gleason 2020-07-29 12:43:39 -05:00
commit d8a01c9432
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
37 changed files with 733 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/mastodon_api/views/instance_view.ex
View file

@ -26,6 +26,7 @@ defmodule Pleroma.Web.MastodonAPI.InstanceView do
thumbnail: Keyword.get(instance, :instance_thumbnail),
languages: ["en"],
registrations: Keyword.get(instance, :registrations_open),
approval_required: Keyword.get(instance, :account_approval_required),
# Extra (not present in Mastodon):
max_toot_chars: Keyword.get(instance, :limit),
poll_limits: Keyword.get(instance, :poll_limits),