Merge branch 'master' of https://github.com/redmatrix/redmatrix

Conflicts: include/diaspora.php
2015-07-23 21:07:35 -07:00
parent c0e67db070 908da4589d
commit cc5b0cde1d
6 changed files with 10 additions and 6 deletions
--- 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;