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
@@ -63,7 +63,7 @@ class MailLinkService
            'subject' => __('Login to :name', [
                'name' => admin_setting('app_name', 'Notification Service')
            ]),
-            'template_name' => 'login',
+            'template_name' => 'mailLogin',
            'template_value' => [
                'name' => admin_setting('app_name', 'Notification Service'),
                'link' => $link,