Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 11 Feb 2019 06:54:21 +0000 (13:54 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 11 Feb 2019 06:54:21 +0000 (13:54 +0700)
commit305d2194136d4560e02c110d528164034d3727b2
tree40510e1c4dc0140ff16e2fdc483da64c83b7077c
parent5b1d7c3c5672af065af503891d156b6e0cf5a8c1
parent06c4935c11fc58f5ede18706bc46dcc502e64052
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs

# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
config/config.exs
docs/config.md
lib/pleroma/web/activity_pub/activity_pub.ex
lib/pleroma/web/activity_pub/activity_pub_controller.ex
lib/pleroma/web/activity_pub/utils.ex
lib/pleroma/web/federator/federator.ex
lib/pleroma/web/ostatus/ostatus_controller.ex
lib/pleroma/web/salmon/salmon.ex
lib/pleroma/web/websub/websub.ex
lib/pleroma/web/websub/websub_controller.ex