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_0x6e.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_0x6e.html')
| -rw-r--r-- | doc/html/globals_func_0x6e.html | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/doc/html/globals_func_0x6e.html b/doc/html/globals_func_0x6e.html index 10a7c856b..8af69c3b4 100644 --- a/doc/html/globals_func_0x6e.html +++ b/doc/html/globals_func_0x6e.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> @@ -161,8 +161,8 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');}); <li>network_init() : <a class="el" href="mod_2network_8php.html#a180fce90ad11d7e0e45be094da7149ec">network.php</a> </li> -<li>network_query_get_sel_tab() -: <a class="el" href="mod_2network_8php.html#aeaa518c1a317516a3da337b88d358666">network.php</a> +<li>network_tabs() +: <a class="el" href="conversation_8php.html#a96b34b9d64d13c543e8163e52f5ce8c4">conversation.php</a> </li> <li>network_to_name() : <a class="el" href="contact__selectors_8php.html#ad472e4716426dd1a9dd77b62962454be">contact_selectors.php</a> @@ -191,12 +191,6 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');}); <li>node2bbcodesub() : <a class="el" href="html2bbcode_8php.html#a39c662b19d318990fee2ba795a55d7a7">html2bbcode.php</a> </li> -<li>nogroup_content() -: <a class="el" href="nogroup_8php.html#a52085b183f97c552f1db5c4926e8ec30">nogroup.php</a> -</li> -<li>nogroup_init() -: <a class="el" href="nogroup_8php.html#a099cb353bf62e8453069ce107b763212">nogroup.php</a> -</li> <li>normalise_link() : <a class="el" href="text_8php.html#a4bbb7d00c05cd20b4e043424f322388f">text.php</a> </li> @@ -206,6 +200,9 @@ $(document).ready(function(){initNavTree('globals_func_0x6e.html','');}); <li>notags() : <a class="el" href="text_8php.html#a1af49756c8c71902a66c7e329c462beb">text.php</a> </li> +<li>notes_init() +: <a class="el" href="notes_8php.html#a4dbd7b1f906440746af48b484d66535a">notes.php</a> +</li> <li>notice() : <a class="el" href="boot_8php.html#a9255af5ae9c887520091ea04763c1a88">boot.php</a> </li> |