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

2017-06-07 17:11:35 -07:00
parent 2e35dc648f 55836e8ca6
commit 9dbd997141
32 changed files with 3492 additions and 570 deletions
--- a/include/markdown.php
+++ b/include/markdown.php
@@ -13,7 +13,6 @@ require_once("include/html2bbcode.php");
 require_once("include/bbcode.php");


-
 /**
 * @brief
 *