aboutsummaryrefslogtreecommitdiffstats
path: root/include/bbcode.php
diff options
context:
space:
mode:
authorFabio Comuni <fabrix.xm@gmail.com>2012-01-03 21:14:48 +0100
committerFabio Comuni <fabrix.xm@gmail.com>2012-01-03 21:14:48 +0100
commit93563370c96848948d28ed39e13284ebaf7f430a (patch)
tree701c29133372625f54a098026d8570f191727a24 /include/bbcode.php
parentbe2fd56aae51ee02b6e40dedd4383e1ebddc752e (diff)
parent184230e06826117b1d87241e3acdf19935470e8f (diff)
downloadvolse-hubzilla-93563370c96848948d28ed39e13284ebaf7f430a.tar.gz
volse-hubzilla-93563370c96848948d28ed39e13284ebaf7f430a.tar.bz2
volse-hubzilla-93563370c96848948d28ed39e13284ebaf7f430a.zip
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'include/bbcode.php')
-rw-r--r--include/bbcode.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/bbcode.php b/include/bbcode.php
index 5218a06e8..6b733c8f4 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -27,7 +27,7 @@ function tryoembed($match){
// BBcode 2 HTML was written by WAY2WEB.net
- // extended to work with Mistpark/Friendika - Mike Macgirvin
+ // extended to work with Mistpark/Friendica - Mike Macgirvin
function bbcode($Text,$preserve_nl = false) {