From 5a6906f710e9333507486df3cbb545a67a040881 Mon Sep 17 00:00:00 2001
From: Jake Vanderwerf <get@jakevanderwerf.ca>
Date: Sun, 24 May 2026 02:26:17 +0000
Subject: [PATCH] =Minor changes to email.php, which had info for Legacy and edmonton.ink hardcoded in it. Added a colours.php and JVB_COLOURS constant to define our base, contrast, action, and secondary colours for use within php templates

---
 inc/managers/queue/Operation.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/inc/managers/queue/Operation.php b/inc/managers/queue/Operation.php
index d1cdac7..ac6a3fc 100644
--- a/inc/managers/queue/Operation.php
+++ b/inc/managers/queue/Operation.php
@@ -32,5 +32,6 @@
 	public ?string $completedAt = null;
 
 	public ?array $result = null;
+	public ?string $merged_into = null;
 	public bool $userDismissed = false;
 }

--
Gitblit v1.10.0