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_0x6c.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_0x6c.html')
| -rw-r--r-- | doc/html/globals_func_0x6c.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_func_0x6c.html b/doc/html/globals_func_0x6c.html index c65719712..239413aec 100644 --- a/doc/html/globals_func_0x6c.html +++ b/doc/html/globals_func_0x6c.html @@ -219,10 +219,13 @@ $(document).ready(function(){initNavTree('globals_func_0x6c.html','');}); <li>load_xconfig() : <a class="el" href="include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52">config.php</a> </li> +<li>local_channel() +: <a class="el" href="boot_8php.html#ae2811a843962fb9bf5e34fc8f64eaadb">boot.php</a> +</li> <li>local_dir_update() : <a class="el" href="dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e">dir_fns.php</a> </li> -<li>local_channel() +<li>local_user() : <a class="el" href="boot_8php.html#ad4c9dc2c8a82e8f52b7404c1655eab44">boot.php</a> </li> <li>localize_item() |