diff options
| author | kaniini <ariadne@dereferenced.org> | 2019-09-30 11:21:49 +0000 |
|---|---|---|
| committer | kaniini <ariadne@dereferenced.org> | 2019-09-30 11:21:49 +0000 |
| commit | 26f66fb70ab1bd777a92daf4347aaa63b044d0af (patch) | |
| tree | 75d562e8e5d9f6a036d626e0cb9d081998242263 /lib/pleroma/web/router.ex | |
| parent | 0e356cc8003665ec05a42e39b3a5c47e31ec384c (diff) | |
| parent | 0dc8f3d6d2fa18261e9a6fa8da540c434f1fa67b (diff) | |
| download | pleroma-26f66fb70ab1bd777a92daf4347aaa63b044d0af.tar.gz | |
Merge branch 'features/apc2s-media-upload' into 'develop'
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
Diffstat (limited to 'lib/pleroma/web/router.ex')
| -rw-r--r-- | lib/pleroma/web/router.ex | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index fa6f1ec76..9fd13c2fd 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -608,6 +608,7 @@ defmodule Pleroma.Web.Router do scope [] do pipe_through(:oauth_write) post("/users/:nickname/outbox", ActivityPubController, :update_outbox) + post("/api/ap/upload_media", ActivityPubController, :upload_media) end scope [] do |