Merge branch 'develop' into refactor/notification_settings
authorMark Felder <feld@FreeBSD.org>
Mon, 13 Jul 2020 18:32:21 +0000 (13:32 -0500)
committerMark Felder <feld@FreeBSD.org>
Mon, 13 Jul 2020 18:32:21 +0000 (13:32 -0500)
commit80c21100db306ce45856bbdb97d3439676babeeb
treed143f523da262df5176220fbe6dc0b6370c91ebc
parentce85db41a30d95555bbd44d8931c4a3a357938d8
parent5d215fd81f529b639db9096ca71d4e7f0a6ed386
Merge branch 'develop' into refactor/notification_settings
CHANGELOG.md
lib/pleroma/notification.ex
lib/pleroma/web/api_spec/schemas/account.ex
test/notification_test.exs
test/web/mastodon_api/views/account_view_test.exs
test/web/twitter_api/util_controller_test.exs