aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x73.html
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:14:59 +0200
committerChristian Vogeley <christian.vogeley@hotmail.de>2013-08-03 00:14:59 +0200
commit9294f72adb3c076932558b6f29a4c570e7962764 (patch)
treec0a7d4f5b56e922c2a572f4f0a414a405f92cd82 /doc/html/globals_0x73.html
parentc0cd147a3a9a86b270ea32026089ced16fb2f50c (diff)
downloadvolse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.tar.gz
volse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.tar.bz2
volse-hubzilla-9294f72adb3c076932558b6f29a4c570e7962764.zip
Revert "merge"
This reverts commit c0cd147a3a9a86b270ea32026089ced16fb2f50c, reversing changes made to d2d1e54bfe928fe4cdfdcfc7e9acf658cda76898.
Diffstat (limited to 'doc/html/globals_0x73.html')
-rw-r--r--doc/html/globals_0x73.html9
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index ae6e39d5b..2607ec664 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -144,6 +144,9 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
<div class="textblock">Here is a list of all file members with links to the files they belong to:</div>
<h3><a class="anchor" id="index_s"></a>- s -</h3><ul>
+<li>salmon_key()
+: <a class="el" href="crypto_8php.html#a9191447cc46f0b4eaba3273e313994d5">crypto.php</a>
+</li>
<li>sanitise_acl()
: <a class="el" href="text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c">text.php</a>
</li>
@@ -205,13 +208,13 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
: <a class="el" href="include_2config_8php.html#afe117b70f1bba2f6348d9300b601f86e">config.php</a>
</li>
<li>settings_aside()
-: <a class="el" href="settings_8php.html#ae5aebccb006bee1300078576baaf5582">settings.php</a>
+: <a class="el" href="mod_2settings_8php.html#ae5aebccb006bee1300078576baaf5582">settings.php</a>
</li>
<li>settings_init()
-: <a class="el" href="settings_8php.html#a3a4cde287482fced008583f54ba2a722">settings.php</a>
+: <a class="el" href="mod_2settings_8php.html#a3a4cde287482fced008583f54ba2a722">settings.php</a>
</li>
<li>settings_post()
-: <a class="el" href="settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings.php</a>
+: <a class="el" href="mod_2settings_8php.html#aa7ee94d88ac088edb04ccf3a26de3586">settings.php</a>
</li>
<li>setup_content()
: <a class="el" href="setup_8php.html#a88247384a96e14516f474d7af6a465c1">setup.php</a>