diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /doc/html/globals_0x68.html | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'doc/html/globals_0x68.html')
| -rw-r--r-- | doc/html/globals_0x68.html | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/doc/html/globals_0x68.html b/doc/html/globals_0x68.html index eda1d5c74..ced466c5a 100644 --- a/doc/html/globals_0x68.html +++ b/doc/html/globals_0x68.html @@ -213,6 +213,12 @@ $(document).ready(function(){initNavTree('globals_0x68.html','');}); <li>http_status_exit() : <a class="el" href="include_2network_8php.html#a4cfb2c05a1c295317283d762440ce0b2">network.php</a> </li> +<li>hub_post_return() +: <a class="el" href="pubsub_8php.html#ad4e82341660e72cb8eaad56aa1e9e945">pubsub.php</a> +</li> +<li>hub_return() +: <a class="el" href="pubsub_8php.html#a24c84d42f653bdb084726c1e5791eebb">pubsub.php</a> +</li> <li>hubloc_change_primary() : <a class="el" href="hubloc_8php.html#ad86214b3a74084bd7b54e8d6c919ce4d">hubloc.php</a> </li> |