Merge remote-tracking branch 'origin/master' into claude/parental-control-feature-31dde2

# Conflicts:
#	apps/web/src/app/settings/settings-options.ts
#	apps/web/src/app/settings/settings.component.html
This commit is contained in:
4gray committed 2026-09-27 08:49:18 +02:00
commit cdc79da768
135 files changed
+4814 -426

No files matched your search

+1
View File
@@ -1,6 +1,7 @@
{
"extends": "./tsconfig.json",
"compilerOptions": {
"emitDecoratorMetadata": false,
"outDir": "../../../dist/out-tsc",
"esModuleInterop": true,
"module": "commonjs",