Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop
authorGérald Niel <gerald.niel@gegeweb.org>
Sun, 25 Mar 2018 13:56:45 +0000 (15:56 +0200)
committerGérald Niel <gerald.niel@gegeweb.org>
Sun, 25 Mar 2018 13:56:45 +0000 (15:56 +0200)
commit5b107cd341936f30ec1246ed2fb20b3aed04703d
treea4045d15991386ddeb5d11e7c449023d31b48cfb
parent5c25dbc22df29c295370f8ac690ba7565368e1c9
parent5c5638a062d90a0f0cd5f6e8ccb3589099668e79
Merge branch 'develop' of github.com:Chocobozzz/PeerTube into develop