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/_setup.php |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/inc/managers/queue/_setup.php b/inc/managers/queue/_setup.php
index 37de16b..5431780 100644
--- a/inc/managers/queue/_setup.php
+++ b/inc/managers/queue/_setup.php
@@ -11,6 +11,7 @@
 
 //Merging logic
 require_once JVB_DIR .'/inc/managers/queue/mergers/DefaultMerger.php';
+require_once JVB_DIR .'/inc/managers/queue/mergers/UploadMerger.php';
 
 // Value objects / DTOs
 require_once JVB_DIR . '/inc/managers/queue/Operation.php';

--
Gitblit v1.10.0