Merge from upstream
[oweals/peertube.git] / shared / models / videos / video-transcoding-fps.model.ts
2018-11-13 ChocobozzzMerge branch 'master' into develop
2018-10-19 ChocobozzzMerge branch 'release/v1.0.0' into develop
2018-10-11 ChocobozzzMerge branch 'release/v1.0.0' into develop
2018-10-08 Felix AbleitnerSet bitrate limits for transcoding (fixes #638) (#1135)