merge: sync upstream/master preserving local changes

2026-04-23 22:27:18 +08:00
parent 60b5c99e74 ec1efb4482
commit 9ce345eb76
94 changed files with 14065 additions and 650 deletions
@@ -178,7 +178,6 @@ class ConfigController extends Controller
                'server_ws_url' => admin_setting('server_ws_url', ''),
            ],
            'email' => [
-                'email_template' => admin_setting('email_template', 'default'),
                'email_host' => admin_setting('email_host'),
                'email_port' => admin_setting('email_port'),
                'email_username' => admin_setting('email_username'),