diff options
| author | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2021-07-21 15:51:30 +0200 |
| commit | a24bd1ed41b43790bab6ba789580bb4e85f07d85 (patch) | |
| tree | a54b0f6c921ba83a6e909cd0ced325b2d4b8863c /server/controllers/api/config.ts | |
| parent | 5f26f13b3c16ac5ae0a3b0a7142d84a9528cf565 (diff) | |
| parent | c63830f15403ac4e750829f27d8bbbdc9a59282c (diff) | |
| download | PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.gz PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.tar.zst PeerTube-a24bd1ed41b43790bab6ba789580bb4e85f07d85.zip | |
Merge branch 'next' into develop
Diffstat (limited to 'server/controllers/api/config.ts')
| -rw-r--r-- | server/controllers/api/config.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/api/config.ts b/server/controllers/api/config.ts index 9bd8c21c5..ee733a38c 100644 --- a/server/controllers/api/config.ts +++ b/server/controllers/api/config.ts | |||
| @@ -1,8 +1,8 @@ | |||
| 1 | import { ServerConfigManager } from '@server/lib/server-config-manager' | ||
| 2 | import * as express from 'express' | 1 | import * as express from 'express' |
| 3 | import { remove, writeJSON } from 'fs-extra' | 2 | import { remove, writeJSON } from 'fs-extra' |
| 4 | import { snakeCase } from 'lodash' | 3 | import { snakeCase } from 'lodash' |
| 5 | import validator from 'validator' | 4 | import validator from 'validator' |
| 5 | import { ServerConfigManager } from '@server/lib/server-config-manager' | ||
| 6 | import { UserRight } from '../../../shared' | 6 | import { UserRight } from '../../../shared' |
| 7 | import { About } from '../../../shared/models/server/about.model' | 7 | import { About } from '../../../shared/models/server/about.model' |
| 8 | import { CustomConfig } from '../../../shared/models/server/custom-config.model' | 8 | import { CustomConfig } from '../../../shared/models/server/custom-config.model' |