diff options
author | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:42:14 +0700 |
---|---|---|
committer | Egor Kislitsyn <egor@kislitsyn.com> | 2019-10-24 14:55:36 +0700 |
commit | 4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c (patch) | |
tree | f296a9b23362e59daf1eac6b669886be8dab1576 /lib/pleroma/web/router.ex | |
parent | 478f0883eb994c639923b7b27259a02bcef8708c (diff) | |
parent | 17c237ba808d4356bb1e202e459680563b79ef99 (diff) | |
download | pleroma-4c1dd55c48f80f3ebdb26d1a0c1a75b7922f578c.tar.gz |
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
Diffstat (limited to 'lib/pleroma/web/router.ex')
-rw-r--r-- | lib/pleroma/web/router.ex | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index f2588f89e..f69c5c2bc 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -405,6 +405,9 @@ defmodule Pleroma.Web.Router do get("/push/subscription", SubscriptionController, :get) put("/push/subscription", SubscriptionController, :update) delete("/push/subscription", SubscriptionController, :delete) + + get("/markers", MarkerController, :index) + post("/markers", MarkerController, :upsert) end scope "/api/web", Pleroma.Web do |