Merge branch 'develop' into issue/1276-2
authorMaksim Pechnikov <parallel588@gmail.com>
Wed, 6 May 2020 11:47:50 +0000 (14:47 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Wed, 6 May 2020 11:47:50 +0000 (14:47 +0300)
commit8b97b6f5baa7e0593414fa794ce8059a8e5b95e3
treebfdc8369105af33f42f5b56b197623ce72c6fed5
parentfb38b7339ccb6c3d7a3a07b74a6471a0f38622fe
parent07e7c80bc9e919cd92ca9dda1e21384142e5bd77
Merge branch 'develop' into issue/1276-2
CHANGELOG.md
lib/pleroma/web/mastodon_api/views/marker_view.ex
test/web/mastodon_api/controllers/marker_controller_test.exs