Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
authorGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
committerGérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
commit0030284b0df2983914291d6fe83675e2aa892e6a
tree2379f6f0c8a5e6ec1cb86d4bc808c7c48a4c4422
parentea5cd0fa2cdc7655ed5ecf134dedd52400837ef2
parentf55e5a7bf81c2c27db1514273e3366511aabf4ae
Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop
client/src/app/videos/+video-watch/video-watch.component.scss