Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
authorIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 23 Oct 2019 14:22:42 +0000 (17:22 +0300)
committerIvan Tashkinov <ivantashkinov@gmail.com>
Wed, 23 Oct 2019 14:22:42 +0000 (17:22 +0300)
commit8cc809e44e3a899f93061c4c5f68d9736d79d79e
tree8193991e2a2b705a60d847a626d22abaf756d7f1
parent11cd9944258bfc2123b821b21321e12097d0f19b
parent54077677eaad44ea355c7f0db7ea5e94183d5a30
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation

# Conflicts:
# lib/pleroma/notification.ex
CHANGELOG.md
lib/pleroma/notification.ex
test/notification_test.exs
test/web/activity_pub/activity_pub_controller_test.exs
test/web/activity_pub/transmogrifier_test.exs