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

This commit is contained in:
zotlabs
2018-08-20 20:20:57 -07:00
4 changed files with 117 additions and 57 deletions

View File

@@ -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;