Merge remote-tracking branch 'origin/master' into 0.10.0

2018-06-01 08:01:09 +02:00
parent 8ccb898aa9 b80bdcbc4f
commit d39cebc70e
20 changed files with 100 additions and 49 deletions
--- a/install/lib/class.FroxlorInstall.php
+++ b/install/lib/class.FroxlorInstall.php
@@ -1017,7 +1017,7 @@ class FroxlorInstall

 		// check for json extension
 		$content .= $this->_status_message('begin', $this->_lng['requirements']['phpjson']);
-		
+
 		if (! extension_loaded('json')) {
 			$content .= $this->_status_message('red', $this->_lng['requirements']['notinstalled']);
 			$_die = true;