Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
authorGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 17:28:55 +0000 (19:28 +0200)
committerGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 17:28:55 +0000 (19:28 +0200)
commit0db1a226507a39b0a663e3e63f04851836a44d5a
tree8c8dad658ea5608afaae238cfb6fe803292f908f
parent0030284b0df2983914291d6fe83675e2aa892e6a
parentd4f3fea659163749f9ea879a5e1dd313106353c6
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop