.mokogitea/manifest.xml

@@ -9,7 +9,7 @@
     <display-name>Template - MokoOnyx</display-name>
     <org>MokoConsulting</org>
     <description>MokoOnyx - Joomla site template (successor to MokoCassiopeia)</description>
-    <version>02.13.00</version>
+    <version>02.13.01</version>
     <license spdx="GPL-3.0-or-later">GNU General Public License v3</license>
   </identity>
   <governance>

.mokogitea/workflows/issue-branch.yml

@@ -5,7 +5,11 @@
 # FILE INFORMATION
 # DEFGROUP: Gitea.Workflow
 # INGROUP: moko-platform.Automation
+<<<<<<< HEAD
+# VERSION: 02.13.01
+=======
 # VERSION: 02.13.00
+>>>>>>> origin/main
 # BRIEF: Auto-create feature branch when an issue is opened
 
 name: "Universal: Issue Branch"

CHANGELOG.md

@@ -8,11 +8,19 @@
  DEFGROUP: Joomla.Template.Site
  INGROUP: MokoOnyx.Documentation
  PATH: ./CHANGELOG.md
+<<<<<<< HEAD
+ VERSION: 02.13.01
+ BRIEF: Changelog file documenting version history of MokoOnyx
+ -->
+
+# Changelog — MokoOnyx (VERSION: 02.13.01)
+=======
  VERSION: 02.13.00
  BRIEF: Changelog file documenting version history of MokoOnyx
  -->
 
 # Changelog — MokoOnyx (VERSION: 02.13.00)
+>>>>>>> origin/main
 ## [Unreleased]
 
 ## [02.13.00] --- 2026-05-30

SECURITY.md

@@ -10,7 +10,11 @@
  INGROUP: MokoOnyx.Governance
  REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  FILE: SECURITY.md
+<<<<<<< HEAD
+ VERSION: 02.13.01
+=======
  VERSION: 02.13.00
+>>>>>>> origin/main
  BRIEF: Security policy and vulnerability reporting process for MokoOnyx.
  PATH: /SECURITY.md
  NOTE: This policy is process oriented and does not replace secure engineering practices.

src/html/com_joomgallery/category/default.php

@@ -11,7 +11,11 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/com_joomgallery/category/default.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Category view override — password gate then loads default_cat sub-layout
  */
 

src/html/com_joomgallery/category/default_cat.php

@@ -11,7 +11,11 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/com_joomgallery/category/default_cat.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Category sub-layout — subcategories grid + images grid with pagination
  */
 

src/html/com_joomgallery/gallery/default.php

@@ -11,7 +11,11 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/com_joomgallery/gallery/default.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Gallery view override — main image grid with masonry/justified layout
  */
 

src/html/com_joomgallery/image/default.php

@@ -11,7 +11,11 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/com_joomgallery/image/default.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Image detail view override — single image with metadata, tags, custom fields
  */
 

src/html/layouts/joomla/module/card.php

@@ -10,7 +10,11 @@
  * INGROUP: MokoOnyx
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /html/layouts/joomla/module/card.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Custom card module chrome — renders module titles for all modules
  */
 

src/html/layouts/mokoonyx/article-metadata.php

@@ -11,7 +11,11 @@
  * INGROUP: MokoOnyx.Layouts
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: /src/html/layouts/mokoonyx/article-metadata.php
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: Article metadata footer layout -- renders jcfields grouped by field group
  */
 

src/media/css/a11y-high-contrast.css

@@ -10,7 +10,11 @@
  * INGROUP: MokoOnyx.Accessibility
  * REPO: https://git.mokoconsulting.tech/MokoConsulting/MokoOnyx
  * PATH: ./media/css/a11y-high-contrast.css
+<<<<<<< HEAD
+ * VERSION: 02.13.01
+=======
  * VERSION: 02.13.00
+>>>>>>> origin/main
  * BRIEF: High-contrast stylesheet for accessibility toolbar
  */
 

src/media/css/template.css

@@ -23528,4 +23528,3 @@ font-size: 0.8125rem;
 .fa-brands {
 	margin-right: 0.25rem;
 }
-.fa-light { margin-right: 0.25rem; }

src/templateDetails.xml

@@ -36,7 +36,15 @@
 		</server>
 	</updateservers>
 	<name>mokoonyx</name>
+<<<<<<< HEAD
+<<<<<<< HEAD
+	<version>02.13.01-dev</version>
+=======
+	<version>02.13.01-dev</version>
+>>>>>>> 14006b21d4476c6951926ea0db4f8979333552fd
+=======
 	<version>02.13.00</version>
+>>>>>>> origin/main
 	<scriptfile>script.php</scriptfile>
 	<creationDate>2026-05-16</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>