aboutsummaryrefslogtreecommitdiffstats
path: root/boot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-07-23 21:07:35 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-07-23 21:07:35 -0700
commitcc5b0cde1df8f47ccf6db13304ffca25c7ff5f9a (patch)
treebff687980744c0aeffbedc37dd1dc5e88ada940b /boot.php
parentc0e67db070ae562f8e717a12faf5df9ecd7160d6 (diff)
parent908da4589dc4961c07d049c97bcfd59bc2973c89 (diff)
downloadvolse-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-xboot.php1
1 files changed, 0 insertions, 1 deletions
diff --git a/boot.php b/boot.php
index 45e071003..ff6eeccf8 100755
--- a/boot.php
+++ b/boot.php
@@ -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;