Merge branch 'master' into feat/local-image-proxy
commit 951ed00805f4586ca6b0fa5c4b9b46c4c26f1d78
2 parents 16f8a1c + 2d8238f
@TomatoCake TomatoCake authored on 28 Jun 2024
GitHub committed on 28 Jun 2024
Showing 6 changed files
View
assets/locales/de/auth.json
View
assets/locales/en/auth.json
View
assets/locales/ur/auth.json
View
src/api/routes/channels/#channel_id/index.ts
View
src/util/entities/Channel.ts
View
src/util/entities/UserSettings.ts