Merge remote-tracking branch 'mike/master' into dev

2018-05-05 10:03:57 +02:00
parent 192b69b11a c6e65ec6da
commit 0895756658
2 changed files with 3 additions and 2 deletions
--- a/Zotlabs/Module/Wfinger.php
+++ b/Zotlabs/Module/Wfinger.php
@@ -109,7 +109,8 @@ class Wfinger extends \Zotlabs\Web\Controller {
 	
 			$aliases = array(
 				z_root() . (($pchan) ? '/pchan/' : '/channel/') . $r[0]['channel_address'],
-				z_root() . '/~' . $r[0]['channel_address']
+				z_root() . '/~' . $r[0]['channel_address'],
+				z_root() . '/@' . $r[0]['channel_address']
 			);
 	
 			if($h) {