Merge branch 'feature/peertube_2' into 'develop'
authorkaniini <nenolod@gmail.com>
Tue, 21 Aug 2018 16:58:44 +0000 (16:58 +0000)
committerkaniini <nenolod@gmail.com>
Tue, 21 Aug 2018 16:58:44 +0000 (16:58 +0000)
rebase/update of feature/peertube

See merge request pleroma/pleroma!217


Trivial merge