diff options
author | Chocobozzz <me@florianbigard.com> | 2021-04-08 15:16:01 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2021-04-08 15:16:01 +0200 |
commit | dc48fdbe68e9dd3a3a6028181e61d8595d98e654 (patch) | |
tree | b641873412bfb4ff2a754a27762cd533c735e7d8 /server/models | |
parent | 27ec473f5306621643fcb169be7cfe6b15136265 (diff) | |
parent | b9244002fcc48dda7f3a588980d910a40429238f (diff) | |
download | PeerTube-dc48fdbe68e9dd3a3a6028181e61d8595d98e654.tar.gz PeerTube-dc48fdbe68e9dd3a3a6028181e61d8595d98e654.tar.zst PeerTube-dc48fdbe68e9dd3a3a6028181e61d8595d98e654.zip |
Merge branch 'release/3.1.0' into develop
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/video/video.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/models/video/video.ts b/server/models/video/video.ts index b10c6e38e..e9afb2c18 100644 --- a/server/models/video/video.ts +++ b/server/models/video/video.ts | |||
@@ -917,7 +917,7 @@ export class VideoModel extends Model { | |||
917 | }, | 917 | }, |
918 | include: [ | 918 | include: [ |
919 | { | 919 | { |
920 | attributes: [ 'language', 'fileUrl' ], | 920 | attributes: [ 'filename', 'language', 'fileUrl' ], |
921 | model: VideoCaptionModel.unscoped(), | 921 | model: VideoCaptionModel.unscoped(), |
922 | required: false | 922 | required: false |
923 | }, | 923 | }, |