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

2017-05-17 11:25:33 +02:00
parent 4b718929df ed4d589077
commit 3fe7bf27de
13 changed files with 2764 additions and 497 deletions
--- a/include/nav.php
+++ b/include/nav.php
@@ -257,6 +257,8 @@ EOT;

 	usort($syslist,'Zotlabs\\Lib\\Apps::app_name_compare');

+	$syslist = Zlib\Apps::app_order(local_channel(),$syslist);
+
 	foreach($syslist as $app) {
 		$nav_apps[] = Zlib\Apps::app_render($app,'nav');
 	}