Merge branch 'develop' into issue/1342
authorMaksim Pechnikov <parallel588@gmail.com>
Thu, 5 Dec 2019 12:46:27 +0000 (15:46 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Thu, 5 Dec 2019 12:46:27 +0000 (15:46 +0300)
commit3fe7a1fd35a9ca81b158eff6dbcc25ca48cbf96d
tree9a275a71ab8eeb19ce1e02d0b6ba64fe309f3d79
parenta36607c27e6a50aeca450570f7b8e4c9c0233bb1
parent228bf4d214abe3bb62c52128d3bc145e396b174d
Merge branch 'develop' into issue/1342
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/web/push/impl.ex
test/notification_test.exs
test/support/factory.ex
test/web/mastodon_api/views/account_view_test.exs