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)
commitf6b06d2ac817312b36b7fe78704846541a2e9a5f
treeaaf4b929466b4b73e3503564d9202a5e412a7e90
parenta6d4cc8917b67b1b79891b60bfa3f38b8b58fde8
parent046741c60d46d5f4de5356af79022bcb05bbaad6
Merge branch 'feature/peertube_2' into 'develop'

rebase/update of feature/peertube

See merge request pleroma/pleroma!217