Merge branch 'dev' of https://github.com/git-marijus/hubzilla into git-marijus-dev

2016-08-21 16:33:59 -07:00
parent 4d34d9c032 4f62d7a78f
commit b6a545b4a2
10 changed files with 125 additions and 103 deletions
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -127,7 +127,9 @@ class Rpost extends \Zotlabs\Web\Controller {
 			'return_path' => 'rpost/return',
 			'bbco_autocomplete' => 'bbcode',
 			'editor_autocomplete'=> true,
-			'bbcode' => true
+			'bbcode' => true,
+			'jotnets' => true
+
 		);
 	
 		$editor = status_editor($a,$x);