diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /doc/html/diaspora_8php.js | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2 volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip | |
Merge branch 'master' into tres
Conflicts:
mod/events.php
view/css/mod_events.css
Diffstat (limited to 'doc/html/diaspora_8php.js')
| -rw-r--r-- | doc/html/diaspora_8php.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/diaspora_8php.js b/doc/html/diaspora_8php.js index 9db03ac5d..8131461cb 100644 --- a/doc/html/diaspora_8php.js +++ b/doc/html/diaspora_8php.js @@ -4,7 +4,7 @@ var diaspora_8php = [ "diaspora_comment", "diaspora_8php.html#a0fb2abe304aae19efc040a5e6b917829", null ], [ "diaspora_conversation", "diaspora_8php.html#adef30b6fac948baedcc7194d5d155b5f", null ], [ "diaspora_decode", "diaspora_8php.html#a849754ec369e1a60fadae5c14584ca36", null ], - [ "diaspora_dispatch", "diaspora_8php.html#a6f0a67b6b17503c125af32763be931b7", null ], + [ "diaspora_dispatch", "diaspora_8php.html#af677aaaaf921f5acecf52ae92ac42c66", null ], [ "diaspora_dispatch_public", "diaspora_8php.html#ab99505944728d46585b8312989de533d", null ], [ "diaspora_get_contact_by_handle", "diaspora_8php.html#aa8e551a53fcce34be3942d0c3e20d1f4", null ], [ "diaspora_handle_from_contact", "diaspora_8php.html#a5ed66b910d7b0284f9b3ee04e72306ff", null ], @@ -13,7 +13,7 @@ var diaspora_8php = [ "diaspora_like", "diaspora_8php.html#a5d57518545baa31cf8a85a937a267681", null ], [ "diaspora_message", "diaspora_8php.html#a7cff2f8f11044c1b3a360f20e1bbee46", null ], [ "diaspora_msg_build", "diaspora_8php.html#a4901762cba5cd8dcdc57bdf285eefb1b", null ], - [ "diaspora_photo", "diaspora_8php.html#a71fe9bb66626b4197ae018a230778bb2", null ], + [ "diaspora_photo", "diaspora_8php.html#a72b2887e8be2e51d0114c16499e6ed4c", null ], [ "diaspora_post", "diaspora_8php.html#a20b968d64ef26afe5cb0cc75a7570a31", null ], [ "diaspora_process_outbound", "diaspora_8php.html#a131abd521b218d6ae6f7d2917d8b2605", null ], [ "diaspora_profile", "diaspora_8php.html#a900abf51398b2ef26cd2cd31c52f1b0f", null ], |