aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x68.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_0x68.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_0x68.html')
-rw-r--r--doc/html/globals_0x68.html14
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html
index 5103e6fe6..ef76758fb 100644
--- a/doc/html/globals_0x68.html
+++ b/doc/html/globals_0x68.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>
@@ -150,12 +150,6 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
<li>has_permissions()
: <a class="el" href="items_8php.html#a77051724d1784074ff187e73a4db93fe">items.php</a>
</li>
-<li>hcard_aside()
-: <a class="el" href="hcard_8php.html#a956c7cae2009652a37900306e5b7b73d">hcard.php</a>
-</li>
-<li>hcard_init()
-: <a class="el" href="hcard_8php.html#ac34f26b0e6a37eef44fa49bea135136d">hcard.php</a>
-</li>
<li>head_add_css()
: <a class="el" href="plugin_8php.html#a23c4fccf1eb5fcd63b24783ba1f05f7a">plugin.php</a>
</li>
@@ -171,6 +165,12 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');});
<li>head_get_js()
: <a class="el" href="plugin_8php.html#a65ab52cb1a7030d5190e247211bef2a1">plugin.php</a>
</li>
+<li>head_remove_css()
+: <a class="el" href="plugin_8php.html#a9ab6caae31935f6cf781ce7872db7cdf">plugin.php</a>
+</li>
+<li>head_remove_js()
+: <a class="el" href="plugin_8php.html#a4a0ae7b881e7c8af99a69e3b03f898b4">plugin.php</a>
+</li>
<li>head_set_icon()
: <a class="el" href="boot_8php.html#a0e4701c9742c3ef88f02ac450a042a84">boot.php</a>
</li>