projects
/
oweals
/
peertube.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
ea5cd0f
f55e5a7
)
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)
1
2
client/src/app/videos/+video-watch/video-watch.component.scss
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
client/src/app/videos/+video-watch/video-watch.component.scss
Simple merge
projects / oweals / peertube.git / commitdiff