Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge

1 files changed, 5 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 955e616eb..8518a17f6 100755
--- a/boot.php
+++ b/boot.php
@@ -728,6 +728,11 @@ 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 $override_helproot = null;
+        public  static $override_helpfiles = array();
 
 	public static  $session    = null;
 	public static  $groups;