diff options
| author | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-04 18:56:31 +0300 |
|---|---|---|
| committer | Ivan Tashkinov <ivantashkinov@gmail.com> | 2019-12-04 18:56:31 +0300 |
| commit | 30caf3e51e32830153e693727b3765e8817171a3 (patch) | |
| tree | b752dd12604afa8be2bc7c753a64a5725bc2ebbc /lib/pleroma/web/mastodon_api/controllers | |
| parent | 52cc7de82cf3aa637d599edc357909be8c9366eb (diff) | |
| parent | 228bf4d214abe3bb62c52128d3bc145e396b174d (diff) | |
| download | pleroma-30caf3e51e32830153e693727b3765e8817171a3.tar.gz | |
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
# lib/pleroma/user.ex
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 5ad33d4a4..d71a14434 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 -> |