Merge branch 'release/2.1.0' into develop
authorChocobozzz <me@florianbigard.com>
Tue, 4 Feb 2020 08:20:16 +0000 (09:20 +0100)
committerChocobozzz <me@florianbigard.com>
Tue, 4 Feb 2020 08:20:16 +0000 (09:20 +0100)
commit7cd1b12c19d0589d1d692ed0571ca0800f028aea
treede277870182c6088becaa2f9098b260409f992c3
parentf51c02c77f0dcd25c2dc68a43e51d02d69efcb5a
parent22f18a4a197513c4cae685717829637cae853ae2
Merge branch 'release/2.1.0' into develop
server/models/video/video-format-utils.ts