From adcd939069dc7404e96552aa0f3e216ee1bd1c27 Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Wed, 15 Jan 2025 16:19:01 -0800
Subject: [PATCH 1/2] Suspend arches level template overrides

---
 arches/settings_utils.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arches/settings_utils.py b/arches/settings_utils.py
index 67476e3898..2ef03cb403 100644
--- a/arches/settings_utils.py
+++ b/arches/settings_utils.py
@@ -106,9 +106,9 @@ def build_templates_config(
             directories.append(os.path.join(app_root, "templates"))
 
         # forces Arches-level overrides of generic Django templates
-        directories.append(
-            os.path.join(Path(__file__).resolve().parent, "app", "templates")
-        )
+        # directories.append(
+        #     os.path.join(Path(__file__).resolve().parent, "app", "templates")
+        # )
 
         return [
             {

From 2a705f33c6702194c5a48208705ded455910835b Mon Sep 17 00:00:00 2001
From: Cyrus Hiatt <chiatt@fargeo.com>
Date: Wed, 15 Jan 2025 16:27:44 -0800
Subject: [PATCH 2/2] Changelog entry

---
 releases/7.6.5.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/releases/7.6.5.md b/releases/7.6.5.md
index 5ab1ea4dbc..e1c17e1051 100644
--- a/releases/7.6.5.md
+++ b/releases/7.6.5.md
@@ -2,7 +2,9 @@
 
 ### Bug Fixes and Enhancements
 
-- Fix Activity Stream id value #[11727](https://github.com/archesproject/arches/issues/11727)
+- Fix Activity Stream id value [#11727](https://github.com/archesproject/arches/issues/11727)
+- Prevent Arches templates from overriding App templates [#11731]https://github.com/archesproject/arches/pull/11731
+
 
 ### Dependency changes: