diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /doc/html/globals_0x74.html | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.gz volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.tar.bz2 volse-hubzilla-f0c7612bcd49d32e408e67ac1829ee891c677f7e.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
Diffstat (limited to 'doc/html/globals_0x74.html')
| -rw-r--r-- | doc/html/globals_0x74.html | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/doc/html/globals_0x74.html b/doc/html/globals_0x74.html index 2580271b1..791885bd4 100644 --- a/doc/html/globals_0x74.html +++ b/doc/html/globals_0x74.html @@ -247,7 +247,7 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); : <a class="el" href="plugin_8php.html#a65fedcffbe03562ef844cabee37d34e2">plugin.php</a> </li> <li>theme_post() -: <a class="el" href="view_2theme_2redbasic_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6">config.php</a> +: <a class="el" href="view_2theme_2apw_2php_2config_8php.html#ad29461920cf03b9ce1428e21eb1f4ba6">config.php</a> </li> <li>theme_status() : <a class="el" href="admin_8php.html#ad4f74f33944a98b56d2c8c7601f124a4">admin.php</a> @@ -282,6 +282,9 @@ $(document).ready(function(){initNavTree('globals_0x74.html','');}); <li>translate_system_apps() : <a class="el" href="include_2apps_8php.html#a48289d5cc44b7638191738106ac5d030">apps.php</a> </li> +<li>trim_message() +: <a class="el" href="po2php_8php.html#a4f3dc9b019d0cd1dc171c54c991ef334">po2php.php</a> +</li> <li>tryoembed() : <a class="el" href="bbcode_8php.html#a55b0cb6973f1ec731de0e726bcc0efa7">bbcode.php</a> </li> |