Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending...
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 25 Mar 2020 06:05:17 +0000 (09:05 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 25 Mar 2020 06:05:17 +0000 (09:05 +0300)
commit012d428e1ffdd83888f339e4dbaec344202eebe1
tree41483fdfb5c75e6d338ad48b83f7d4e621365694
parente743c2232970e321c833604b232520587ad8e402
parent8eebc75c152ee339bac347350266e3bc6536016b
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
config/description.exs
lib/pleroma/notification.ex
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/mastodon_api/controllers/account_controller.ex
test/notification_test.exs
test/user_test.exs