aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x69.html
diff options
context:
space:
mode:
authorThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
committerThomas Willingham <beardyunixer@beardyunixer.com>2014-09-09 21:32:25 +0100
commitec4f30c3f672bbfc57bee8db0aaa0cf002fe8687 (patch)
treecf1aa37d881f2ce3cb844bbcd5c11c5999e96c66 /doc/html/globals_0x69.html
parent652ec8c3fcc956c1a5fc2adb7410e4c4a2ac6f90 (diff)
parent409c89d629993b59eaafa8443ae9d0b5f0344c1f (diff)
downloadvolse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.gz
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.tar.bz2
volse-hubzilla-ec4f30c3f672bbfc57bee8db0aaa0cf002fe8687.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_0x69.html')
-rw-r--r--doc/html/globals_0x69.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x69.html b/doc/html/globals_0x69.html
index e114f862a..41df68ff8 100644
--- a/doc/html/globals_0x69.html
+++ b/doc/html/globals_0x69.html
@@ -163,6 +163,9 @@ $(document).ready(function(){initNavTree('globals_0x69.html','');});
, <a class="el" href="theme_2mytheme_2php_2default_8php.html#a3987f5547ceb7e36a210a66a06241a5a">default.php</a>
, <a class="el" href="full_8php.html#a3987f5547ceb7e36a210a66a06241a5a">full.php</a>
</li>
+<li>import_author_diaspora()
+: <a class="el" href="items_8php.html#a2c3f97b2109c05df86d97449b3c78ebc">items.php</a>
+</li>
<li>import_author_rss()
: <a class="el" href="items_8php.html#a6bee35961f2e32905f20367a9309d627">items.php</a>
</li>