]> git.immae.eu Git - github/Chocobozzz/PeerTube.git/commitdiff
Merge branch 'release/3.2.0' into develop
authorChocobozzz <me@florianbigard.com>
Wed, 26 May 2021 11:41:15 +0000 (13:41 +0200)
committerChocobozzz <me@florianbigard.com>
Wed, 26 May 2021 11:41:15 +0000 (13:41 +0200)
1  2 
server/models/redundancy/video-redundancy.ts
server/models/video/video.ts

Simple merge