From: kaniini <nenolod@gmail.com>
Date: Tue, 21 Aug 2018 16:58:44 +0000 (+0000)
Subject: Merge branch 'feature/peertube_2' into 'develop'
X-Git-Url: https://git.squeep.com/?a=commitdiff_plain;h=f6b06d2ac817312b36b7fe78704846541a2e9a5f;p=akkoma

Merge branch 'feature/peertube_2' into 'develop'

rebase/update of feature/peertube

See merge request pleroma/pleroma!217
---

f6b06d2ac817312b36b7fe78704846541a2e9a5f