diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
| commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
| tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /doc/html/zot_8php.js | |
| parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
| parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
| download | volse-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/zot_8php.js')
| -rw-r--r-- | doc/html/zot_8php.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 3b7b0c60b..dd70498b0 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -4,6 +4,7 @@ var zot_8php = [ "build_sync_packet", "zot_8php.html#ac34e479d27f32b82dd6b33542f81a6a7", null ], [ "delete_imported_item", "zot_8php.html#adfeb9400ae6b726beec89f8f1e8fde72", null ], [ "get_rpost_path", "zot_8php.html#a8e22dbc6f884be3644a892a876cbd972", null ], + [ "import_author_zot", "zot_8php.html#ad149f1e98c0c5b88ff9147e6ee3f330d", null ], [ "import_directory_keywords", "zot_8php.html#a3bf11286c2619b4ca28e49d5b5ab374a", null ], [ "import_directory_profile", "zot_8php.html#aeec89da5b6ff090c63a79de4de884a35", null ], [ "import_site", "zot_8php.html#a2657e141d62d5f67ad3c87651b585299", null ], @@ -19,7 +20,7 @@ var zot_8php = [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], [ "zot_finger", "zot_8php.html#a95528377d7303131958c9f0b7158fdce", null ], - [ "zot_get_hubloc", "zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e", null ], + [ "zot_get_hublocs", "zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7", null ], [ "zot_gethub", "zot_8php.html#a55056e863a7860bc0cf922e78fcce073", null ], [ "zot_import", "zot_8php.html#aeea071f17e306fe3d0c488551906bfab", null ], [ "zot_new_uid", "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7", null ], |