diff options
author | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-12-02 16:26:19 +0000 |
commit | 7722e5a67a46304f3ae0e37f674a44ca9268be5e (patch) | |
tree | 504f7b7623c6917fcfa567050d80153e2f2aee11 /lib/pleroma/web/mastodon_api/controllers | |
parent | d468cba2d56f60a41b0372a381b1017a8d2d046b (diff) | |
parent | 1fc28a4b441fdc0de8b2b43e2b045da38ee50b0a (diff) | |
download | pleroma-7722e5a67a46304f3ae0e37f674a44ca9268be5e.tar.gz |
Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
-rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/account_controller.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex index 5f2544640..a69423f60 100644 --- a/lib/pleroma/web/mastodon_api/controllers/account_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/account_controller.ex @@ -152,6 +152,7 @@ defmodule Pleroma.Web.MastodonAPI.AccountController do :hide_favorites, :show_role, :skip_thread_containment, + :allow_following_move, :discoverable ] |> Enum.reduce(%{}, fn key, acc -> |