diff options
author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
---|---|---|
committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2015-09-18 18:51:39 +0200 |
commit | ce28760c2a7319f3cdc25c39a62582b722e91006 (patch) | |
tree | 802f64d3988fc14a277c79ee5192693a4202b502 /include/bbcode.php | |
parent | 438cb1d7e0f1518dd35a3a377dfd9a9fd885f80c (diff) | |
parent | 87c8cf489210136958d2e0b44e4c3ca48c1ff8af (diff) | |
download | volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.gz volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.tar.bz2 volse-hubzilla-ce28760c2a7319f3cdc25c39a62582b722e91006.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/bbcode.php')
-rw-r--r-- | include/bbcode.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index 66bf6b5ec..db5824237 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -437,7 +437,7 @@ function bb_observer($Text) { // BBcode 2 HTML was written by WAY2WEB.net - // extended to work with Mistpark/Friendica/Red - Mike Macgirvin + // extended to work with Mistpark/Friendica/Redmatrix/Hubzilla - Mike Macgirvin function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false) { |