aboutsummaryrefslogtreecommitdiffstats
path: root/include/html2plain.php
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-03-14 22:50:30 +0000
committerThomas Willingham <founder@kakste.com>2013-03-14 22:50:30 +0000
commitd07971b909363dd82faee3e4b5a218cb21d376dc (patch)
tree1d4b76c4ed24bf3c8cbb81c73069eb8ab4b2644c /include/html2plain.php
parentfbc5260995866c280fbc48bfb7899836f46136f4 (diff)
parentffcba3db81d85ae8bdc56f1772c7675aef56c78e (diff)
downloadvolse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.gz
volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.tar.bz2
volse-hubzilla-d07971b909363dd82faee3e4b5a218cb21d376dc.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: view/theme/redbasic/css/style.css
Diffstat (limited to 'include/html2plain.php')
-rw-r--r--include/html2plain.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/html2plain.php b/include/html2plain.php
index b86d88710..2f5be7f69 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -219,4 +219,4 @@ function html2plain($html, $wraplength = 75, $compact = false)
return(trim($message));
}
-?>
+