aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x69.html
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-12-22 14:31:27 +0100
commit870df76463a1cc9823b364db0bfb387f3f46664f (patch)
treea8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/globals_func_0x69.html
parent25a533bd72c34e9775af71c010a39db6caf7b633 (diff)
parent7e7b5bfa4930493a8feae10b0550e29797956c70 (diff)
downloadvolse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz
volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2
volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts: view/php/theme_init.php
Diffstat (limited to 'doc/html/globals_func_0x69.html')
-rw-r--r--doc/html/globals_func_0x69.html20
1 files changed, 7 insertions, 13 deletions
diff --git a/doc/html/globals_func_0x69.html b/doc/html/globals_func_0x69.html
index 898c8f3df..1c0b48bfb 100644
--- a/doc/html/globals_func_0x69.html
+++ b/doc/html/globals_func_0x69.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>
@@ -146,9 +146,6 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
<li>identity_basic_export()
: <a class="el" href="identity_8php.html#a3570a4eb77332b292d394c4132cb8f03">identity.php</a>
</li>
-<li>identity_basic_import()
-: <a class="el" href="identity_8php.html#a77ee7d66eb0758f7e7882f70ad0f9485">identity.php</a>
-</li>
<li>identity_check_service_class()
: <a class="el" href="identity_8php.html#ac9fcd5c4c371998790b5c55c3d0f4633">identity.php</a>
</li>
@@ -158,6 +155,9 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
<li>import_author_xchan()
: <a class="el" href="items_8php.html#ae73794179b62d39bb597ff670ab1c1e5">items.php</a>
</li>
+<li>import_author_zot()
+: <a class="el" href="zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d">zot.php</a>
+</li>
<li>import_channel_photo()
: <a class="el" href="photo__driver_8php.html#a1d0bc7161dec0d177b7d3bbe4421af9a">photo_driver.php</a>
</li>
@@ -188,18 +188,12 @@ $(document).ready(function(){initNavTree('globals_func_0x69.html','');});
<li>info()
: <a class="el" href="boot_8php.html#adfb2fc7be5a4226c0a8e24131da9d498">boot.php</a>
</li>
+<li>insert_hook()
+: <a class="el" href="plugin_8php.html#aeaebe63dcf6fa2794f363ba2bc0b2c6b">plugin.php</a>
+</li>
<li>install_plugin()
: <a class="el" href="plugin_8php.html#a482131013272a1d5d5c1b1469c6c55d5">plugin.php</a>
</li>
-<li>intro_aside()
-: <a class="el" href="intro_8php.html#abc3abf25da64f98f215126eb08c7936b">intro.php</a>
-</li>
-<li>intro_content()
-: <a class="el" href="intro_8php.html#a3e2a523697633ddb4517b9266a515f5b">intro.php</a>
-</li>
-<li>intro_post()
-: <a class="el" href="intro_8php.html#af3681062183ccbdf065ae2647b07d6f1">intro.php</a>
-</li>
<li>invite_content()
: <a class="el" href="invite_8php.html#a244385b28cfd021d308715f01158bfd9">invite.php</a>
</li>