Merge develop
authorRoman Chvanikov <chvanikoff@pm.me>
Mon, 16 Sep 2019 17:30:42 +0000 (20:30 +0300)
committerRoman Chvanikov <chvanikoff@pm.me>
Mon, 16 Sep 2019 17:30:42 +0000 (20:30 +0300)
commit76c3e290fcb211ba21bf78711d832edbfc8f8979
treecb8c3846ceb42b261c58dd294a55c553524ade34
parentd7457c9165b83c0f1514cf0532b5a8bdc515ea02
parenta58f29b826333c1ecb0907228f0e087a3ecd9778
Merge develop
lib/pleroma/notification.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/router.ex
test/notification_test.exs
test/web/mastodon_api/mastodon_api_controller_test.exs