Revert "Merge branch 'issue/1276' into 'develop'"
authorlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:32:22 +0000 (16:32 +0000)
committerlain <lain@soykaf.club>
Tue, 14 Apr 2020 16:32:22 +0000 (16:32 +0000)
commit4576520461e2e3a1c78133aaf31cb742a2a1a689
treebdabe459c11fd9ef2f79402c6a454c3ca04fb341
parent3677a1e5785e8a753652debf37b2818e622f9ffd
Revert "Merge branch 'issue/1276' into 'develop'"

This reverts merge request !1877
CHANGELOG.md
docs/API/differences_in_mastoapi_responses.md
lib/pleroma/marker.ex
lib/pleroma/notification.ex
lib/pleroma/web/mastodon_api/views/marker_view.ex
mix.lock
priv/repo/migrations/20200210050658_update_markers.exs [deleted file]
test/marker_test.exs
test/notification_test.exs
test/web/mastodon_api/controllers/marker_controller_test.exs
test/web/mastodon_api/views/marker_view_test.exs