diff options
| author | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-01-31 00:50:20 -0800 |
| commit | e6a5f7800390e5091743d6a97c6fd8f54c5d1530 (patch) | |
| tree | 20c49c7d11b411b91530ef43374a208274ebbb57 /doc/html/globals_func_0x72.html | |
| parent | 4a243b63f7019a1e56ecf03b138cd7fc396236c2 (diff) | |
| parent | 3e5226adc70838c784a0b208de25fffde37a6679 (diff) | |
| download | volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.gz volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.tar.bz2 volse-hubzilla-e6a5f7800390e5091743d6a97c6fd8f54c5d1530.zip | |
Merge branch 'master' into tres
Conflicts:
include/zot.php
Diffstat (limited to 'doc/html/globals_func_0x72.html')
| -rw-r--r-- | doc/html/globals_func_0x72.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x72.html b/doc/html/globals_func_0x72.html index 75559eca2..0b0535477 100644 --- a/doc/html/globals_func_0x72.html +++ b/doc/html/globals_func_0x72.html @@ -270,10 +270,13 @@ $(document).ready(function(){initNavTree('globals_func_0x72.html','');}); <li>reltoabs() : <a class="el" href="text_8php.html#ad855a32bee22c3f3b9734e3a334b96f2">text.php</a> </li> +<li>remote_channel() +: <a class="el" href="boot_8php.html#ad9f1a90205081844e1e9c4b2ffd95458">boot.php</a> +</li> <li>remote_online_status() : <a class="el" href="identity_8php.html#a47d6f53216f23a3484061793bef29854">identity.php</a> </li> -<li>remote_channel() +<li>remote_user() : <a class="el" href="boot_8php.html#a5542c5c2806ab8bca04bad53d47b5209">boot.php</a> </li> <li>remove_all_xchan_resources() |