diff options
| author | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
|---|---|---|
| committer | Thomas Willingham <founder@kakste.com> | 2013-12-18 18:21:47 +0000 |
| commit | 7ac00d02d110ec2f2d33779d8316e17c13cda149 (patch) | |
| tree | 03b41e86e0790895fe56488beea2b5f554fbaeae /doc/html/globals_func_0x61.html | |
| parent | 733cb37ef14eb4dd5408e1a8c453f13cd41952eb (diff) | |
| parent | df34aaba4733b1c38ac2b8b9c19c5a945d5a841b (diff) | |
| download | volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.gz volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.tar.bz2 volse-hubzilla-7ac00d02d110ec2f2d33779d8316e17c13cda149.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
mod/page.php
Diffstat (limited to 'doc/html/globals_func_0x61.html')
| -rw-r--r-- | doc/html/globals_func_0x61.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/html/globals_func_0x61.html b/doc/html/globals_func_0x61.html index 1fa26b2b8..b1e765e82 100644 --- a/doc/html/globals_func_0x61.html +++ b/doc/html/globals_func_0x61.html @@ -28,7 +28,7 @@ <table cellspacing="0" cellpadding="0"> <tbody> <tr style="height: 56px;"> - <td id="projectlogo"><img alt="Logo" src="rhash-64.png"/></td> + <td id="projectlogo"><img alt="Logo" src="rm-64.png"/></td> <td style="padding-left: 0.5em;"> <div id="projectname">The Red Matrix </div> @@ -176,9 +176,6 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); <li>add_children_to_list() : <a class="el" href="conversation_8php.html#ad3e1d4b15e7d6d026ee182edd58f692b">conversation.php</a> </li> -<li>add_fcontact() -: <a class="el" href="include_2network_8php.html#a0bdc4b0bfc54797c249dc4eca25aeda4">network.php</a> -</li> <li>admin_content() : <a class="el" href="admin_8php.html#afef415e4011607fbb665610441595015">admin.php</a> </li> @@ -222,7 +219,7 @@ $(document).ready(function(){initNavTree('globals_func_0x61.html','');}); : <a class="el" href="admin_8php.html#acf51f5837a7427832144c2bf7308ada3">admin.php</a> </li> <li>advanced_profile() -: <a class="el" href="profile__advanced_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4">profile_advanced.php</a> +: <a class="el" href="identity_8php.html#aa870d2c1f558cfd52bef05bc124e8fa4">identity.php</a> </li> <li>AES256CBC_decrypt() : <a class="el" href="crypto_8php.html#ac852ee41392d1358c3a54d54935e0bf9">crypto.php</a> |