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

1 files changed, 1 insertions, 0 deletions

diff --git a/boot.php b/boot.php
index 9f5651cd7..e3939a5d3 100755
--- a/boot.php
+++ b/boot.php
@@ -48,6 +48,7 @@ require_once('include/zid.php');
 require_once('include/xchan.php');
 require_once('include/hubloc.php');
 require_once('include/attach.php');
+require_once('include/bbcode.php');
 
 define ( 'PLATFORM_NAME',           'hubzilla' );
 define ( 'STD_VERSION',             '3.1.1' );