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_0x7a.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_0x7a.html')
-rw-r--r-- | doc/html/globals_func_0x7a.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/doc/html/globals_func_0x7a.html b/doc/html/globals_func_0x7a.html index bfdd75ee2..e64c265ec 100644 --- a/doc/html/globals_func_0x7a.html +++ b/doc/html/globals_func_0x7a.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> @@ -144,7 +144,7 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');}); <h3><a class="anchor" id="index_z"></a>- z -</h3><ul> <li>z_birthday() -: <a class="el" href="boot_8php.html#ab55e545b72ec8c097e052ea7d373491f">boot.php</a> +: <a class="el" href="datetime_8php.html#ab55e545b72ec8c097e052ea7d373491f">datetime.php</a> </li> <li>z_fetch_url() : <a class="el" href="include_2network_8php.html#aafd06c0a75402aefb06cfb9f9740fa37">network.php</a> @@ -171,10 +171,10 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');}); : <a class="el" href="zfinger_8php.html#a8139b83a22ef98869adc10aa224027a0">zfinger.php</a> </li> <li>zid() -: <a class="el" href="boot_8php.html#a5b815330f3d177ab383af37a6c12e532">boot.php</a> +: <a class="el" href="identity_8php.html#a5b815330f3d177ab383af37a6c12e532">identity.php</a> </li> <li>zid_init() -: <a class="el" href="boot_8php.html#a680fbafc2db023c5b1309e0180e81315">boot.php</a> +: <a class="el" href="identity_8php.html#a680fbafc2db023c5b1309e0180e81315">identity.php</a> </li> <li>zidify_callback() : <a class="el" href="text_8php.html#a405afe814a23f3bd94d826101aa168ab">text.php</a> @@ -197,8 +197,8 @@ $(document).ready(function(){initNavTree('globals_func_0x7a.html','');}); <li>zot_finger() : <a class="el" href="zot_8php.html#a95528377d7303131958c9f0b7158fdce">zot.php</a> </li> -<li>zot_get_hubloc() -: <a class="el" href="zot_8php.html#acdea9362d78a63dce948fdf0ea73ef0e">zot.php</a> +<li>zot_get_hublocs() +: <a class="el" href="zot_8php.html#ae7cec2b417b5858fd4a41070f843d1d7">zot.php</a> </li> <li>zot_gethub() : <a class="el" href="zot_8php.html#a55056e863a7860bc0cf922e78fcce073">zot.php</a> |