diff options
| author | kaniini <nenolod@gmail.com> | 2018-09-07 23:47:43 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2018-09-07 23:47:43 +0000 |
| commit | 14a762a213db0d00550c1421651ef689249c9c57 (patch) | |
| tree | 43f1a7520301af2ac1d90efd4dd01dbe0c9043bf /lib/pleroma/web/router.ex | |
| parent | 403f9d118dadcef806044831221d5c67800ce34d (diff) | |
| parent | c1d07da4e18cc2acd11a5a131e1482aec5996552 (diff) | |
| download | pleroma-14a762a213db0d00550c1421651ef689249c9c57.tar.gz | |
Merge branch 'fix/tusk' into 'develop'
Fix signin and initial loading with Tusk
See merge request pleroma/pleroma!333
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 63493ae1c..9dcf44795 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -162,6 +162,8 @@ defmodule Pleroma.Web.Router do delete("/filters/:id", MastodonAPIController, :delete_filter) get("/suggestions", MastodonAPIController, :suggestions) + + get("/filters", MastodonAPIController, :filters) end scope "/api/web", Pleroma.Web.MastodonAPI do |