Merge branch 'develop' into issue/1276
authorMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Mar 2020 11:10:45 +0000 (14:10 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Mar 2020 11:10:59 +0000 (14:10 +0300)
commitedb659dc579fe56227adef0b0704ff13b6ef717e
treee9d48cd8afd99877d5b4c696d8b7a62a9d2121bd
parent10f452ad1feae9a882b6dc4cd35e09adb7e78208
parent6d797b99282ff1067c6af04b3e1775ff2281333b
Merge branch 'develop' into issue/1276
CHANGELOG.md
lib/pleroma/marker.ex
lib/pleroma/notification.ex
lib/pleroma/web/mastodon_api/views/marker_view.ex
mix.lock
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