harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/dev' into website-export

Browse Source
This commit is contained in:
Andrew Manning
2016-08-19 19:34:04 -04:00
parent 40a7d38210 e4244c0cac
commit cf93d9c3b4
11 changed files with 8724 additions and 8736 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zotlabs/Module/Settings.php
View File

@@ -1028,7 +1028,7 @@ class Settings extends \Zotlabs\Web\Controller {
$theme_config = theme_content($a);
}
logger('schemas: ' . print_r($schemas,true));
// logger('schemas: ' . print_r($schemas,true));
$tpl = get_markup_template("settings_display.tpl");
$o = replace_macros($tpl, array(