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/client.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/client.ts')
| -rw-r--r-- | server/controllers/client.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/client.ts b/server/controllers/client.ts index eb1ee6cbd..ba3c54440 100644 --- a/server/controllers/client.ts +++ b/server/controllers/client.ts | |||
| @@ -5,7 +5,7 @@ import { join } from 'path' | |||
| 5 | import { logger } from '@server/helpers/logger' | 5 | import { logger } from '@server/helpers/logger' |
| 6 | import { CONFIG } from '@server/initializers/config' | 6 | import { CONFIG } from '@server/initializers/config' |
| 7 | import { Hooks } from '@server/lib/plugins/hooks' | 7 | import { Hooks } from '@server/lib/plugins/hooks' |
| 8 | import { HttpStatusCode } from '@shared/core-utils' | 8 | import { HttpStatusCode } from '@shared/models' |
| 9 | import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n' | 9 | import { buildFileLocale, getCompleteLocale, is18nLocale, LOCALE_FILES } from '@shared/core-utils/i18n' |
| 10 | import { root } from '../helpers/core-utils' | 10 | import { root } from '../helpers/core-utils' |
| 11 | import { STATIC_MAX_AGE } from '../initializers/constants' | 11 | import { STATIC_MAX_AGE } from '../initializers/constants' |