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_0x6d.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_0x6d.html')
| -rw-r--r-- | doc/html/globals_0x6d.html | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/doc/html/globals_0x6d.html b/doc/html/globals_0x6d.html index 83a755fa0..c61a2e1e6 100644 --- a/doc/html/globals_0x6d.html +++ b/doc/html/globals_0x6d.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> @@ -259,7 +259,7 @@ $(document).ready(function(){initNavTree('globals_0x6d.html','');}); : <a class="el" href="text_8php.html#a1633412120f52bdce5f43e0a127d9293">text.php</a> </li> <li>mini_group_select() -: <a class="el" href="include_2group_8php.html#ab4d9e5b59f48787cb01baae5dc6c381f">group.php</a> +: <a class="el" href="include_2group_8php.html#ab0e422a0f31c0c64fd9084ca03d85f32">group.php</a> </li> <li>mitem_content() : <a class="el" href="mitem_8php.html#a7a31b702ecad18eeb6a38b243ff0037e">mitem.php</a> |