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

2017-07-21 16:20:50 -07:00
parent 89d21c0873 27678a523c
commit 992f8272d3
19 changed files with 35 additions and 35 deletions
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -154,7 +154,7 @@ class Network extends \Zotlabs\Web\Controller {
 				));
 			}
 	
-			nav_set_selected('network');
+			nav_set_selected(t('Activity'));

 			$channel_acl = array(
 				'allow_cid' => $channel['channel_allow_cid'],