aboutsummaryrefslogtreecommitdiffhomepage
path: root/server/models
diff options
context:
space:
mode:
authorChocobozzz <me@florianbigard.com>2021-05-26 15:38:44 +0200
committerChocobozzz <me@florianbigard.com>2021-05-26 15:38:44 +0200
commit5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458 (patch)
tree5195b77f303b7903d0d0f797efdbce21e2e53551 /server/models
parent99c5d041fca134e1fdf96aecefa5eacf6cfdb967 (diff)
parent6c8a99d12ad1a6ffd4bc564bab48f4d4a5588ae2 (diff)
downloadPeerTube-5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458.tar.gz
PeerTube-5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458.tar.zst
PeerTube-5ec3cbdf22fc88ebe57f370fc0bc0e3df7453458.zip
Merge branch 'release/3.2.0' into develop
Diffstat (limited to 'server/models')
-rw-r--r--server/models/redundancy/video-redundancy.ts2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/models/redundancy/video-redundancy.ts b/server/models/redundancy/video-redundancy.ts
index f7a989691..ca56a57dc 100644
--- a/server/models/redundancy/video-redundancy.ts
+++ b/server/models/redundancy/video-redundancy.ts
@@ -1,5 +1,5 @@
1import { sample } from 'lodash' 1import { sample } from 'lodash'
2import { FindOptions, literal, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize' 2import { literal, Op, QueryTypes, Transaction, WhereOptions } from 'sequelize'
3import { 3import {
4 AllowNull, 4 AllowNull,
5 BeforeDestroy, 5 BeforeDestroy,