aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/router.ex
diff options
context:
space:
mode:
authorlambda <pleromagit@rogerbraun.net>2018-07-18 08:52:11 +0000
committerlambda <pleromagit@rogerbraun.net>2018-07-18 08:52:11 +0000
commitb7001ea9e72947596b60e080768be10b4cbae82b (patch)
treeeda8c988ce1a6a81f9d8275a07caed33aac78e1e /lib/pleroma/web/router.ex
parentd93789dfde3c44c76a56732088a897ddddfe9716 (diff)
parent18cac1e36bd91e1554de1f495a7f178b27b2fbc3 (diff)
downloadpleroma-b7001ea9e72947596b60e080768be10b4cbae82b.tar.gz
Merge branch 'feature/media-description' into 'develop'
Feature/media description Closes #174 See merge request pleroma/pleroma!255
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r--lib/pleroma/web/router.ex1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 34652cdde..fc7a947aa 100644
--- a/lib/pleroma/web/router.ex
+++ b/lib/pleroma/web/router.ex
@@ -127,6 +127,7 @@ defmodule Pleroma.Web.Router do
get("/notifications/:id", MastodonAPIController, :get_notification)
post("/media", MastodonAPIController, :upload)
+ put("/media/:id", MastodonAPIController, :update_media)
get("/lists", MastodonAPIController, :get_lists)
get("/lists/:id", MastodonAPIController, :get_list)