- Merged with master done

This commit is contained in:
Dave Mc Nicoll committed 2026-10-19 20:01:01 +00:00
1 parent 6cb5e7bba8
commit e3b22335e1
1 file changed
+2 -2
+2 -2
View File
@@ -66,8 +66,8 @@ class ApplicationStrategy extends Strategy\ApplicationStrategy {
return $this->di->get('error.404'); return $this->di->get('error.404');
} }
}; };
<<<<<<< HEAD <<<<<<< HEAD
} }
>>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/ >>>>>>> af8b686 (- WIP on ulmus-user mechanics updates)*/