aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x78.html
diff options
context:
space:
mode:
authorThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
committerThomas Willingham <founder@kakste.com>2013-12-18 18:21:47 +0000
commit7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch)
tree03b41e86e0790895fe56488beea2b5f554fbaeae /doc/html/globals_func_0x78.html
parent733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff)
parentdf34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff)
downloadvolse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2
volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: mod/page.php
Diffstat (limited to 'doc/html/globals_func_0x78.html')
-rw-r--r--doc/html/globals_func_0x78.html5
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x78.html b/doc/html/globals_func_0x78.html
index 6df4adb06..f0f230193 100644
--- a/doc/html/globals_func_0x78.html
+++ b/doc/html/globals_func_0x78.html
@@ -28,7 +28,7 @@
<table cellspacing="0" cellpadding="0">
<tbody>
<tr style="height: 56px;">
- <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td>
+ <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td>
<td style="padding-left: 0.5em;">
<div id="projectname">The Red Matrix
</div>
@@ -164,6 +164,9 @@ $(document).ready(function(){initNavTree('globals_func_0x78.html','');});
<li>xmlify()
: <a class="el" href="text_8php.html#aaed4413ed8918838b517e3b2fafaea0d">text.php</a>
</li>
+<li>xpost_to_html2bbcode()
+: <a class="el" href="post__to__red_8php.html#af2713018a2dc97e88f121fc6215beb66">post_to_red.php</a>
+</li>
<li>xrd_init()
: <a class="el" href="xrd_8php.html#aee3cf087968e4a0ff3a87de16eb23270">xrd.php</a>
</li>