aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x6c.html
diff options
context:
space:
mode:
authorhabeascodice <habeascodice@federated.social>2014-10-06 08:43:29 -0700
committerhabeascodice <habeascodice@federated.social>2014-10-06 08:43:29 -0700
commit6b40c2cd090d1c406b3e1cd7ad135baff21bfd54 (patch)
treea9d5b42f896384b129b8edfe5b9e8ec2b21ca21d /doc/html/globals_0x6c.html
parent79bb60aafd39fef7bc4d03eb40d33e23af5b793f (diff)
parent34ef3fda76a924d09e77a698e38b79922b8b7f88 (diff)
downloadvolse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.gz
volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.tar.bz2
volse-hubzilla-6b40c2cd090d1c406b3e1cd7ad135baff21bfd54.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'doc/html/globals_0x6c.html')
-rw-r--r--doc/html/globals_0x6c.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/globals_0x6c.html b/doc/html/globals_0x6c.html
index 808af3f25..e3a5f0b1b 100644
--- a/doc/html/globals_0x6c.html
+++ b/doc/html/globals_0x6c.html
@@ -202,7 +202,7 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
: <a class="el" href="plugin_8php.html#a326365e48ef94f0b9a0a771b8d75e813">plugin.php</a>
</li>
<li>load_pconfig()
-: <a class="el" href="include_2config_8php.html#ac543813a980b3841cc5a277fcd4a24a6">config.php</a>
+: <a class="el" href="include_2config_8php.html#a559791dda7fef8a4b2394c83e835787b">config.php</a>
</li>
<li>load_plugin()
: <a class="el" href="plugin_8php.html#a9ca9632b7309a65b05c03a3e2f473a3d">plugin.php</a>
@@ -211,7 +211,7 @@ $(document).ready(function(){initNavTree('globals_0x6c.html','');});
: <a class="el" href="language_8php.html#a7e9904c730bb24ddcb0ff50fc96f6b05">language.php</a>
</li>
<li>load_xconfig()
-: <a class="el" href="include_2config_8php.html#a55bbed9a014c9109c767486834f3ca33">config.php</a>
+: <a class="el" href="include_2config_8php.html#aee4b619839cf4b64220f34edf5c67b52">config.php</a>
</li>
<li>local_dir_update()
: <a class="el" href="dir__fns_8php.html#acd37b17dce3bdec6d5a6344a20598c1e">dir_fns.php</a>