diff options
| author | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
|---|---|---|
| committer | Haelwenn (lanodan) Monnier <contact@hacktivis.me> | 2020-03-19 19:25:50 +0100 |
| commit | a8aa91753024dbd211e5e3952f5b305debaa8b55 (patch) | |
| tree | 01088f8cec46c4b437b338cb78aaaee65e5d8bc7 /lib/pleroma/web | |
| parent | c1fd4f665335ba67336bd1b2fab2d9df5e247e08 (diff) | |
| parent | 952cb589f47972bba8f9b94b2935a60f05e21bd3 (diff) | |
| download | pleroma-a8aa91753024dbd211e5e3952f5b305debaa8b55.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
Diffstat (limited to 'lib/pleroma/web')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api.ex b/lib/pleroma/web/mastodon_api/mastodon_api.ex index 3fe2be521..a2dc9bc71 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api.ex @@ -72,7 +72,6 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPI do exclude_visibilities: {:array, :string}, reblogs: :boolean, with_muted: :boolean, - with_move: :boolean, account_ap_id: :string } |