diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
| commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
| tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/globals_func_0x6d.html | |
| parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip | |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/globals_func_0x6d.html')
| -rw-r--r-- | doc/html/globals_func_0x6d.html | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/doc/html/globals_func_0x6d.html b/doc/html/globals_func_0x6d.html index 25e39fcab..d43466984 100644 --- a/doc/html/globals_func_0x6d.html +++ b/doc/html/globals_func_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> @@ -212,9 +212,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6d.html','');}); <li>menu_render() : <a class="el" href="include_2menu_8php.html#a890cc6237971e15f15702e6b2e88502e">menu.php</a> </li> -<li>message_aside() -: <a class="el" href="mod_2message_8php.html#af4ba72486117cc24335fd8e92a2112a7">message.php</a> -</li> <li>message_content() : <a class="el" href="mod_2message_8php.html#a3547ed86d09a4bb8fa64ec374a40ee79">message.php</a> </li> @@ -228,7 +225,7 @@ $(document).ready(function(){initNavTree('globals_func_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> |