From: Egor Kislitsyn <egor@kislitsyn.com>
Date: Mon, 11 Feb 2019 06:54:21 +0000 (+0700)
Subject: Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;ds=inline;h=305d2194136d4560e02c110d528164034d3727b2;hp=305d2194136d4560e02c110d528164034d3727b2;p=akkoma

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
---