aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorkaniini <nenolod@gmail.com>2019-06-01 03:26:05 +0000
committerkaniini <nenolod@gmail.com>2019-06-01 03:26:05 +0000
commitd46cc7896e2434857cfd317709011f57c729877a (patch)
tree163a23387222c3e9efde4dea3d1fbb3ab8b64ead /lib/pleroma/web/router.ex
parent88df6296891547b5730a99efafb9bae0090543b2 (diff)
parent5d3ece2861b619c101d6860fbc1a80bfd8630ba7 (diff)
downloadpleroma-d46cc7896e2434857cfd317709011f57c729877a.tar.gz
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
Bugfix: remove vanilla flavour See merge request pleroma/pleroma!1228
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex4
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 352268b96..dd7c24b52 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -309,8 +309,6 @@ defmodule Pleroma.Web.Router do
post("/conversations/:id/read", MastodonAPIController, :conversation_read)
get("/endorsements", MastodonAPIController, :empty_array)
-
- get("/pleroma/flavour", MastodonAPIController, :get_flavour)
end
scope [] do
@@ -350,8 +348,6 @@ defmodule Pleroma.Web.Router do
put("/filters/:id", MastodonAPIController, :update_filter)
delete("/filters/:id", MastodonAPIController, :delete_filter)
- post("/pleroma/flavour/:flavour", MastodonAPIController, :set_flavour)
-
get("/pleroma/mascot", MastodonAPIController, :get_mascot)
put("/pleroma/mascot", MastodonAPIController, :set_mascot)