aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/mastodon_api/controllers
diff options
context:
space:
mode:
authorMaksim Pechnikov <parallel588@gmail.com>2019-12-05 12:18:59 +0300
committerMaksim Pechnikov <parallel588@gmail.com>2019-12-05 12:18:59 +0300
commite21afdb7c76c9773aeb51e37ff3bc2874e7a74f7 (patch)
treefd8ca0c111cff6ef663b4272d64d64333a451032 /lib/pleroma/web/mastodon_api/controllers
parent88f7cf51d43181b27db5ff1807d3e706fa336bac (diff)
parent228bf4d214abe3bb62c52128d3bc145e396b174d (diff)
downloadpleroma-e21afdb7c76c9773aeb51e37ff3bc2874e7a74f7.tar.gz
Merge branch 'develop' into issue/1411
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
-rw-r--r--lib/pleroma/web/mastodon_api/controllers/account_controller.ex1
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 ->