diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/zot_8php.js | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'doc/html/zot_8php.js')
| -rw-r--r-- | doc/html/zot_8php.js | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 2b888daf0..521de64be 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -11,7 +11,7 @@ var zot_8php = [ "import_xchan", "zot_8php.html#a528e97ca5d69c3b7f35c5d954afde315", null ], [ "make_xchan_hash", "zot_8php.html#a0fc2211c5309d9f925ecc4115e3fdb75", null ], [ "process_channel_sync_delivery", "zot_8php.html#ac301c67864917c35922257950ae0f95c", null ], - [ "process_delivery", "zot_8php.html#a4d9e6ca295e443b740d9960c304b3474", null ], + [ "process_delivery", "zot_8php.html#a0e3006e7a456b2175a9badc96bc5176d", null ], [ "process_location_delivery", "zot_8php.html#a8eeefdb0dad4c436bea9d1c06c0a7988", null ], [ "process_mail_delivery", "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc", null ], [ "process_profile_delivery", "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b", null ], @@ -20,7 +20,7 @@ var zot_8php = [ "sync_locations", "zot_8php.html#ab15c04e7e5f44edf45ec50dd7d183254", null ], [ "update_imported_item", "zot_8php.html#a31aad56acf8ff8f2353e6ff8595544df", null ], [ "update_modtime", "zot_8php.html#ab319d1d9fff9c7775d9daef42d1f33dd", null ], - [ "zot_build_packet", "zot_8php.html#a3862b3161b2c8557dc1a95020179bd81", null ], + [ "zot_build_packet", "zot_8php.html#a084c581d534e7e3b759488b46602288f", null ], [ "zot_encode_locations", "zot_8php.html#ae26ce9f1ad74139193fb6319beac5fca", null ], [ "zot_fetch", "zot_8php.html#a61cdc1ec843663c423ed2d8160ae5aea", null ], [ "zot_finger", "zot_8php.html#a95528377d7303131958c9f0b7158fdce", null ], @@ -28,6 +28,7 @@ var zot_8php = [ "zot_gethub", "zot_8php.html#a55056e863a7860bc0cf922e78fcce073", null ], [ "zot_import", "zot_8php.html#aeea071f17e306fe3d0c488551906bfab", null ], [ "zot_new_uid", "zot_8php.html#ab22d67660702056bf3f4696dcebf5ce7", null ], + [ "zot_process_message_request", "zot_8php.html#a3920afe14fc1d82020161b4b86bcd9ac", null ], [ "zot_process_response", "zot_8php.html#a928f5643ca66ae9635d85aeb2be62e03", null ], [ "zot_refresh", "zot_8php.html#a7ac30ff51274bf0b6d3eade37972145c", null ], [ "zot_register_hub", "zot_8php.html#a5bcdfef419b16075a0eca990956223dc", null ], |