Merge branch 'add-template-overrides' into 'dev'

Add template overrides

See merge request hubzilla/core!1256

1 files changed, 3 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index fca184555..6816187cb 100755
--- a/boot.php
+++ b/boot.php
@@ -728,6 +728,9 @@ class App {
 	private static $perms      = null;            // observer permissions
 	private static $widgets    = array();         // widgets for this page
 	public  static $config     = array();         // config cache
+        public  static $override_intltext_templates = array();
+        public  static $override_markup_templates = array();
+        public  static $override_templateroot = null;
 
 	public static  $session    = null;
 	public static  $groups;