diff options
author | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
---|---|---|
committer | Thomas Willingham <founder@kakste.com> | 2013-07-02 18:36:39 +0100 |
commit | d1cae2da2abc3a602f682114bc02cce08a7e7578 (patch) | |
tree | ef3147f9db85bdde8e26303971a40d86e10bb508 /doc/html/globals_func_0x67.html | |
parent | 33696cc8392daeb08d011aa3b1209f3b121898ea (diff) | |
parent | b86253c655f974920c4d3de0915611a7e66c7336 (diff) | |
download | volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.gz volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.tar.bz2 volse-hubzilla-d1cae2da2abc3a602f682114bc02cce08a7e7578.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_func_0x67.html')
-rw-r--r-- | doc/html/globals_func_0x67.html | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 21601815f..087e50b45 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -177,7 +177,10 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : <a class="el" href="include_2network_8php.html#a78e89557b2fbd344ad790846d761b0c7">network.php</a> </li> <li>get_config() -: <a class="el" href="include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15">config.php</a> +: <a class="el" href="include_2config_8php.html#af02c96e6b37335774b548914ede1d22e">config.php</a> +</li> +<li>get_config_from_storage() +: <a class="el" href="include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74">config.php</a> </li> <li>get_db_errno() : <a class="el" href="setup_8php.html#a8652788e8589778c5f81634a9d5b9429">setup.php</a> @@ -264,10 +267,10 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : <a class="el" href="text_8php.html#a4659fbc4e54ddc700c3aa66b9092c623">text.php</a> </li> <li>get_terms_oftype() -: <a class="el" href="text_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1">text.php</a> +: <a class="el" href="taxonomy_8php.html#a0fb8cf0ac7bcbc8b27d856fe9bf69cd1">taxonomy.php</a> </li> <li>get_theme_config_file() -: <a class="el" href="settings_8php.html#a39abc76ff5459c57e3b957664f273f18">settings.php</a> +: <a class="el" href="mod_2settings_8php.html#a39abc76ff5459c57e3b957664f273f18">settings.php</a> </li> <li>get_theme_info() : <a class="el" href="plugin_8php.html#ad48de9c0fb7f19413a2aa49250d00405">plugin.php</a> @@ -276,7 +279,7 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); : <a class="el" href="plugin_8php.html#a48047edfbef770125a5508dcc2f9282f">plugin.php</a> </li> <li>get_xconfig() -: <a class="el" href="include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b">config.php</a> +: <a class="el" href="include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e">config.php</a> </li> <li>goaway() : <a class="el" href="boot_8php.html#a5ab6181607a090bcdbaa13b15b85aba1">boot.php</a> |