diff options
author | redmatrix <redmatrix@redmatrix.me> | 2015-07-23 21:07:35 -0700 |
---|---|---|
committer | redmatrix <redmatrix@redmatrix.me> | 2015-07-23 21:07:35 -0700 |
commit | cc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a (patch) | |
tree | bff687980744c0aeffbedc37dd1dc5e88ada940b /boot.php | |
parent | c0e67db070ae562f8e717a12faf5df9ecd7160d6 (diff) | |
parent | 908da4589dc4961c07d049c97bcfd59bc2973c89 (diff) | |
download | volse-hubzilla-cc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a.tar.gz volse-hubzilla-cc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a.tar.bz2 volse-hubzilla-cc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a.zip |
Merge branch 'master' of https://github.com/redmatrix/redmatrix
Conflicts:
include/diaspora.php
Diffstat (limited to 'boot.php')
-rwxr-xr-x | boot.php | 1 |
1 files changed, 0 insertions, 1 deletions
@@ -2009,7 +2009,6 @@ function load_pdl(&$a) { if((! $s) && (($p = theme_include($n)) != '')) $s = @file_get_contents($p); - if($s) { comanche_parser($a, $s); $a->pdl = $s; |