diff options
| author | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-20 14:54:30 +0000 |
|---|---|---|
| committer | Haelwenn <git.pleroma.social@hacktivis.me> | 2018-09-20 14:54:30 +0000 |
| commit | 7458adc2567caf90c3b01ef4b8bf90a67cbc041c (patch) | |
| tree | f0d31e8c06c7627abdc4cd54f8f935a304622b7b /lib/pleroma/web/router.ex | |
| parent | c9585ec00760b46f013f36a7f7625ac36471d3e8 (diff) | |
| parent | 40c51f118f463127b2538e04fe3b29f90f89055d (diff) | |
| download | pleroma-7458adc2567caf90c3b01ef4b8bf90a67cbc041c.tar.gz | |
Merge branch 'feature/mastodon_api_2.5.0' into 'develop'
Update mastodon API to 2.5.0
Closes: https://git.pleroma.social/pleroma/pleroma/issues/298
Closes: https://git.pleroma.social/pleroma/pleroma/issues/299
See: https://git.pleroma.social/pleroma/pleroma/merge_requests/351
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index d324efb7e..646e9e5cb 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -172,6 +172,8 @@ defmodule Pleroma.Web.Router do delete("/filters/:id", MastodonAPIController, :delete_filter) get("/suggestions", MastodonAPIController, :suggestions) + + get("/endorsements", MastodonAPIController, :empty_array) end scope "/api/web", Pleroma.Web.MastodonAPI do |