Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

2017-02-06 11:14:59 -08:00
parent d8472cc9f5 70edcabca1
commit 00cfc4be44
44 changed files with 399 additions and 409 deletions
--- a/Zotlabs/Module/Apps.php
+++ b/Zotlabs/Module/Apps.php
@@ -38,7 +38,7 @@ class Apps extends \Zotlabs\Web\Controller {
 		foreach($syslist as $app) {
 			$apps[] = Zlib\Apps::app_render($app,$mode);
 		}
-	
+
 		return replace_macros(get_markup_template('myapps.tpl'), array(
 			'$sitename' => get_config('system','sitename'),
 			'$cat' => ((array_key_exists('cat',$_GET) && $_GET['cat']) ? ' - ' . escape_tags($_GET['cat']) : ''),