Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / include / bbcode.php

diff --git a/include/bbcode.php b/include/bbcode.php
old mode 100755 (executable)
new mode 100644 (file)
index eef1cde..cff26f5
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -285,3 +285,4 @@ function bbcode($Text,$preserve_nl = false) {
 
        return $Text;
 }
+