aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2020-06-02 14:04:34 +0000
committerlain <lain@soykaf.club>2020-06-02 14:04:34 +0000
commit2860c66e88df6746b5ede2cfecf2392abf004fd2 (patch)
tree4eaba88349782c6b3e50afefd1d82224d8f9c96f /lib/pleroma/web/router.ex
parentcd2abcc0e3a67898fbadd073ff778e7342c09709 (diff)
parent6b84c62d4a51cb17192945d1b67999b2c56a23d2 (diff)
downloadpleroma-2860c66e88df6746b5ede2cfecf2392abf004fd2.tar.gz
Merge branch 'feature/embeddable-posts' into 'develop'
Add embeddable posts Closes #1288 See merge request pleroma/pleroma!2319
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index e493a4153..a2626521e 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -664,6 +664,8 @@ defmodule Pleroma.Web.Router do
post("/auth/password", MastodonAPI.AuthController, :password_reset)
get("/web/*path", MastoFEController, :index)
+
+ get("/embed/:id", EmbedController, :show)
end
scope "/proxy/", Pleroma.Web.MediaProxy do