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/include_2config_8php.js | |
| 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/include_2config_8php.js')
| -rw-r--r-- | doc/html/include_2config_8php.js | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/html/include_2config_8php.js b/doc/html/include_2config_8php.js index bf2fb3cea..a9f05bed3 100644 --- a/doc/html/include_2config_8php.js +++ b/doc/html/include_2config_8php.js @@ -3,12 +3,13 @@ var include_2config_8php = [ "del_config", "include_2config_8php.html#a549910227348003efc3c05c9105c42da", null ], [ "del_pconfig", "include_2config_8php.html#a7ad2081c5f812ac4387fd76f3762d941", null ], [ "del_xconfig", "include_2config_8php.html#a9c171def547deee16738dc58fdeb4b72", null ], - [ "get_config", "include_2config_8php.html#a5d19130818ea4c6b8726ab62cd989c15", null ], + [ "get_config", "include_2config_8php.html#af02c96e6b37335774b548914ede1d22e", null ], + [ "get_config_from_storage", "include_2config_8php.html#af08b7adb63adfb2eda7c466fba0cce74", null ], [ "get_pconfig", "include_2config_8php.html#ad58a4913937179adb13201c2ee3261ad", null ], - [ "get_xconfig", "include_2config_8php.html#ae4269ab151d08b5dcb1581b2920a934b", null ], + [ "get_xconfig", "include_2config_8php.html#aa3dc1d3de2d091ac702e675acd3a085e", null ], [ "load_config", "include_2config_8php.html#a27559f388c9b9af81c94e48d6889d1d1", null ], - [ "load_pconfig", "include_2config_8php.html#ab012f852866a0aff9b5180daffa454f5", null ], - [ "load_xconfig", "include_2config_8php.html#a913d4e1a6ee7acc1598c69b902c06fd2", null ], + [ "load_pconfig", "include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6", null ], + [ "load_xconfig", "include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33", null ], [ "set_config", "include_2config_8php.html#ad6da879e4fb5b37d1e161d4e9be5c32a", null ], [ "set_pconfig", "include_2config_8php.html#a61591371cb18764138655d67dc817ab2", null ], [ "set_xconfig", "include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e", null ] |