diff options
| author | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
|---|---|---|
| committer | tony baldwin <tony@tonybaldwin.org> | 2014-04-12 08:37:56 -0400 |
| commit | ebd33b185da1c36e718dfa4a2971c3db35cbda22 (patch) | |
| tree | c23cbf55aac433c90ac254d0684dabf9d4528133 /doc/html/zot_8php.js | |
| parent | 5cca00ddc79dad667464674e08a2a860e262eabd (diff) | |
| parent | d0834c7e1394e1986b2b00e039125deff74d9e5e (diff) | |
| download | volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.gz volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.tar.bz2 volse-hubzilla-ebd33b185da1c36e718dfa4a2971c3db35cbda22.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/css/style.css
whatever
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 ceb74db4e..8545bda42 100644 --- a/doc/html/zot_8php.js +++ b/doc/html/zot_8php.js @@ -10,7 +10,7 @@ var zot_8php = [ "import_site", "zot_8php.html#a2657e141d62d5f67ad3c87651b585299", null ], [ "import_xchan", "zot_8php.html#a71d82d0bec204cdf2bd56e4fd0e0ef8a", null ], [ "process_channel_sync_delivery", "zot_8php.html#ac301c67864917c35922257950ae0f95c", null ], - [ "process_delivery", "zot_8php.html#a37ec13b18057634eadb071f05297f5e1", null ], + [ "process_delivery", "zot_8php.html#a4d9e6ca295e443b740d9960c304b3474", null ], [ "process_mail_delivery", "zot_8php.html#aa6ae96db8cbbdbb10e6876d206bbf7cc", null ], [ "process_profile_delivery", "zot_8php.html#a9a57b40669351c9791126b925cb7ef3b", null ], [ "public_recips", "zot_8php.html#a083aec6c900d244e1bfc1406f9461465", null ], |