diff options
| author | Alex Gleason <alex@alexgleason.me> | 2021-08-05 09:43:24 -0500 |
|---|---|---|
| committer | Alex Gleason <alex@alexgleason.me> | 2021-08-05 11:11:24 -0500 |
| commit | b83758bd9634d4f2fb70a92159072dd44e49bb31 (patch) | |
| tree | 2452e8c4e1544fc9a0ad71292901b6cd52765566 /lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex | |
| parent | 2b3d7794b23aac30cf8f977009d17b1abc602d19 (diff) | |
| parent | 5f5dc24027ee5cfadd226c5db2e2a2bdb0ababe0 (diff) | |
| download | pleroma-b83758bd9634d4f2fb70a92159072dd44e49bb31.tar.gz | |
Merge remote-tracking branch 'pleroma/develop' into moderators
Diffstat (limited to 'lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex')
| -rw-r--r-- | lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex b/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex index d285e4907..be2f4617d 100644 --- a/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex +++ b/lib/pleroma/web/pleroma_api/controllers/conversation_controller.ex @@ -13,7 +13,6 @@ defmodule Pleroma.Web.PleromaAPI.ConversationController do alias Pleroma.Web.Plugs.OAuthScopesPlug plug(Pleroma.Web.ApiSpec.CastAndValidate) - plug(:put_view, Pleroma.Web.MastodonAPI.ConversationView) plug(OAuthScopesPlug, %{scopes: ["read:statuses"]} when action in [:show, :statuses]) plug( |