Merge branch 'feature/masto_api_markers' into 'develop'
authorkaniini <ariadne@dereferenced.org>
Mon, 21 Oct 2019 09:26:17 +0000 (09:26 +0000)
committerkaniini <ariadne@dereferenced.org>
Mon, 21 Oct 2019 09:26:17 +0000 (09:26 +0000)
[#1275] Markers /api/v1/markers

See merge request pleroma/pleroma!1852


Trivial merge