Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
authorlain <lain@soykaf.club>
Fri, 20 Mar 2020 13:52:58 +0000 (14:52 +0100)
committerlain <lain@soykaf.club>
Fri, 20 Mar 2020 13:52:58 +0000 (14:52 +0100)
commit1aa8aa7d7f14c553a8f0bf1ae82f1a1169cb0fc2
treef69f8dbf3a012bab253fe267daf967616eefcc0a
parent9b9d67bbec537df6f7c5729e81da6deeaf896bd9
parentd63dca8d99196c91dc3e20e2d27f61ea753b84af
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
test/notification_test.exs
test/web/activity_pub/activity_pub_test.exs
test/web/mastodon_api/controllers/notification_controller_test.exs
test/web/mastodon_api/views/notification_view_test.exs