diff options
author | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 14:47:50 +0300 |
---|---|---|
committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-05-06 14:47:50 +0300 |
commit | 8b97b6f5baa7e0593414fa794ce8059a8e5b95e3 (patch) | |
tree | bfdc8369105af33f42f5b56b197623ce72c6fed5 /lib/pleroma/web/router.ex | |
parent | fb38b7339ccb6c3d7a3a07b74a6471a0f38622fe (diff) | |
parent | 07e7c80bc9e919cd92ca9dda1e21384142e5bd77 (diff) | |
download | pleroma-8b97b6f5baa7e0593414fa794ce8059a8e5b95e3.tar.gz |
Merge branch 'develop' into issue/1276-2
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index ef2239d59..281516bb8 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -427,7 +427,7 @@ defmodule Pleroma.Web.Router do post("/statuses/:id/unmute", StatusController, :unmute_conversation) post("/push/subscription", SubscriptionController, :create) - get("/push/subscription", SubscriptionController, :get) + get("/push/subscription", SubscriptionController, :show) put("/push/subscription", SubscriptionController, :update) delete("/push/subscription", SubscriptionController, :delete) |