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_0x64.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_0x64.html')
| -rw-r--r-- | doc/html/globals_0x64.html | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/doc/html/globals_0x64.html b/doc/html/globals_0x64.html index 64271db96..bf0bb5f4d 100644 --- a/doc/html/globals_0x64.html +++ b/doc/html/globals_0x64.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> @@ -216,9 +216,6 @@ $(document).ready(function(){initNavTree('globals_0x64.html','');}); <li>detect_language() : <a class="el" href="language_8php.html#a632da17c7ac0d2dc1a00a4706870194b">language.php</a> </li> -<li>dfrn_deliver() -: <a class="el" href="items_8php.html#a8395d189a36abfa0dfff81a2b0e70669">items.php</a> -</li> <li>diaspora2bb() : <a class="el" href="bb2diaspora_8php.html#a26c09c218413610e62e60754c579f6c6">bb2diaspora.php</a> </li> |