diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /doc/html/zot_8php.js | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2 volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
boot.php
include/dba/dba_driver.php
include/diaspora.php
include/follow.php
include/session.php
include/zot.php
mod/photos.php
mod/ping.php
Diffstat (limited to 'doc/html/zot_8php.js')
| -rw-r--r-- | doc/html/zot_8php.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/html/zot_8php.js b/doc/html/zot_8php.js index 1596257c4..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 ], |