Merge branch 'develop' into issue/1342
authorMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Dec 2019 18:25:26 +0000 (21:25 +0300)
committerMaksim Pechnikov <parallel588@gmail.com>
Sun, 8 Dec 2019 18:25:26 +0000 (21:25 +0300)
commit95e6a2acd9b18356e942172aa416d42031e8a17f
treed5093f04fc555435f022c9b3b1f7ce6e945f0199
parent3fe7a1fd35a9ca81b158eff6dbcc25ca48cbf96d
parentaf5fef1f228a1781d7d9cad490d3b3a783389f5e
Merge branch 'develop' into issue/1342
lib/pleroma/notification.ex
lib/pleroma/user.ex
test/notification_test.exs
test/support/factory.ex
test/web/mastodon_api/views/account_view_test.exs
test/web/twitter_api/util_controller_test.exs