Take all changes from b2 into b1

2025-10-10 10:36:42 +00:00
parent 9313c01637
commit 016cb6671a
4 changed files with 1 additions and 893 deletions
@@ -53,16 +53,6 @@ export function activateMaintenanceMode({ message = null, extra = null } = {}) {
  });
 }

-<<<<<<< HEAD
-export function updateMaintenanceState(partial = {}) {
-  return persistState({
-    ...maintenanceState,
-    ...partial
-  });
-}
-
-=======
->>>>>>> feature/v03-notifications
 export function deactivateMaintenanceMode({ message = null } = {}) {
  return persistState({
    active: false,