Merge branch 'develop' of framagit.org:chocobozzz/PeerTube into develop

author Gérald Niel <gerald.niel@gegeweb.org>

Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)

committer Gérald Niel <gerald.niel@gegeweb.org>

Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
author Gérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
committer Gérald Niel <gerald.niel@gegeweb.org>
Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
diff --cc client/src/app/videos/+video-watch/video-watch.component.scss
Simple merge
author	Gérald Niel <gerald.niel@gegeweb.org>
	Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)
committer	Gérald Niel <gerald.niel@gegeweb.org>
	Thu, 19 Apr 2018 05:54:51 +0000 (07:54 +0200)