From: kaniini <ariadne@dereferenced.org>
Date: Mon, 21 Oct 2019 09:26:17 +0000 (+0000)
Subject: Merge branch 'feature/masto_api_markers' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=ce750dbab5de905af1e0ba6ba6a5a08b41600ac1;p=akkoma

Merge branch 'feature/masto_api_markers' into 'develop'

[#1275] Markers /api/v1/markers

See merge request pleroma/pleroma!1852
---

ce750dbab5de905af1e0ba6ba6a5a08b41600ac1