diff options
| author | rinpatch <rinpatch@sdf.org> | 2019-06-03 11:14:52 +0300 |
|---|---|---|
| committer | rinpatch <rinpatch@sdf.org> | 2019-06-03 11:14:52 +0300 |
| commit | 026b245dbc2900d90a737f024b87453bf552b62b (patch) | |
| tree | 8bab0696129f9ba0154879f831cb7543b508a9f2 /lib/pleroma/web/router.ex | |
| parent | 5bd41fef8b5aeff53ed6b096e04507d51c93a83a (diff) | |
| parent | 1236c5dbf55d631b10ad0e73836a2a9cd43ddaa8 (diff) | |
| download | pleroma-026b245dbc2900d90a737f024b87453bf552b62b.tar.gz | |
Merge branch 'develop' into feature/polls-2-electric-boogalo
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 5e9238591..e699f6ae2 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 @@ -352,8 +350,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) |