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/text_8php.js | |
| 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/text_8php.js')
| -rw-r--r-- | doc/html/text_8php.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/text_8php.js b/doc/html/text_8php.js index cf3d8b77f..525dbb5d8 100644 --- a/doc/html/text_8php.js +++ b/doc/html/text_8php.js @@ -69,6 +69,7 @@ var text_8php = [ "return_bytes", "text_8php.html#ae2126da85966da0e79c6bcbac63b0bda", null ], [ "sanitise_acl", "text_8php.html#a9fbeae13c9abd6e27cb4d8d1817f969c", null ], [ "search", "text_8php.html#a876e94892867019935b348b573299352", null ], + [ "searchbox", "text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447", null ], [ "smile_decode", "text_8php.html#aca0f589be74fab1a460c57e88dad9779", null ], [ "smile_encode", "text_8php.html#a44d460fcdee6247c67b9bef3ea15f3e6", null ], [ "smilies", "text_8php.html#a3d225b253bb9e0f2498c11647d927b0b", null ], |