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)
commitce750dbab5de905af1e0ba6ba6a5a08b41600ac1
tree67d60289cfc19f5cde3b8e85c35183b6169cfe51
parent2ebe8c416a72b512feaba87040982da5bcf865cf
parent31d6ef6f92ff028499faa85945a51fdd6b5fcf89
Merge branch 'feature/masto_api_markers' into 'develop'

[#1275] Markers /api/v1/markers

See merge request pleroma/pleroma!1852