diff options
| author | lain <lain@soykaf.club> | 2020-01-20 14:42:43 +0000 |
|---|---|---|
| committer | lain <lain@soykaf.club> | 2020-01-20 14:42:43 +0000 |
| commit | 6a716e3fe5290df80af72e3ad5e45ee3afb581a8 (patch) | |
| tree | 837f45778625fa67d41c9dc60ccd346cad67cd12 /lib/pleroma/web/mastodon_api/controllers | |
| parent | 42ea480e95862c09c07f6b4711648c192a66fdf5 (diff) | |
| parent | 5c533e10e73d92b753d9ac20b2d7ab14f42649b2 (diff) | |
| download | pleroma-6a716e3fe5290df80af72e3ad5e45ee3afb581a8.tar.gz | |
Merge branch 'credo/version-bump-1.1.5' into 'develop'
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
Diffstat (limited to 'lib/pleroma/web/mastodon_api/controllers')
| -rw-r--r-- | lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex b/lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex index fc7d52824..11f7b85d3 100644 --- a/lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex +++ b/lib/pleroma/web/mastodon_api/controllers/subscription_controller.ex @@ -6,9 +6,9 @@ defmodule Pleroma.Web.MastodonAPI.SubscriptionController do @moduledoc "The module represents functions to manage user subscriptions." use Pleroma.Web, :controller + alias Pleroma.Web.MastodonAPI.PushSubscriptionView, as: View alias Pleroma.Web.Push alias Pleroma.Web.Push.Subscription - alias Pleroma.Web.MastodonAPI.PushSubscriptionView, as: View action_fallback(:errors) |