Merge branch 'develop' into refactor/notification_settings
authorMark Felder <feld@FreeBSD.org>
Thu, 25 Jun 2020 19:16:28 +0000 (14:16 -0500)
committerMark Felder <feld@FreeBSD.org>
Thu, 25 Jun 2020 19:26:21 +0000 (14:26 -0500)
commit433c01b370f4bf68d3f016d86c1527b1319e7a0c
tree607d6c7e4e578d6e0ff95963b5565baefc207d85
parentd4b20c96c4030ebb5eb908dc6efcf45be7a8355d
parent1d0804b49f56fe722b12f83269d98acfdee7ac77
Merge branch 'develop' into refactor/notification_settings
CHANGELOG.md
docs/API/pleroma_api.md
lib/pleroma/notification.ex
test/notification_test.exs
test/web/mastodon_api/views/account_view_test.exs