projects
/
oweals
/
peertube.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
f51c02c
22f18a4
)
Merge branch 'release/2.1.0' into develop
author
Chocobozzz
<me@florianbigard.com>
Tue, 4 Feb 2020 08:20:16 +0000
(09:20 +0100)
committer
Chocobozzz
<me@florianbigard.com>
Tue, 4 Feb 2020 08:20:16 +0000
(09:20 +0100)
1
2
server/models/video/video-format-utils.ts
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
server/models/video/video-format-utils.ts
Simple merge
projects / oweals / peertube.git / commitdiff