Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
authorEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Feb 2019 17:38:05 +0000 (00:38 +0700)
committerEgor Kislitsyn <egor@kislitsyn.com>
Mon, 4 Feb 2019 17:38:05 +0000 (00:38 +0700)
commit14d967f515c4a431b8059a19d4b84a83c0f2aa28
treea1f481bb71d87b53a7250495797f18f8dcb6e295
parent3a3a3996b7a37d281745586fa40bbabd5299a1ce
parent3ae11835a9ff8c4bc01c3b790229e87857a9812d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs