Merge branch 'develop' into 'feature/relay'
authorkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 21:06:15 +0000 (21:06 +0000)
committerkaniini <nenolod@gmail.com>
Sun, 26 Aug 2018 21:06:15 +0000 (21:06 +0000)
commit0f5bff8c66fa2b67633fe05de8aaa1985f4d98f8
tree45a693814a7f1f7bd2d6108732f2b75086f1fa0a
parent30261772063a30ca0ef299f441cfed4630ffb630
parent3448b434f54e8b4749524e3ccd876359a6501845
Merge branch 'develop' into 'feature/relay'

# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
config/config.exs
lib/pleroma/user.ex
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/activity_pub/views/user_view.ex
lib/pleroma/web/router.ex