aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_func_0x70.html
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-02-08 20:57:37 -0800
committerfriendica <info@friendica.com>2015-02-08 20:57:37 -0800
commit08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch)
tree477f3a8e84388aab2a4f3c938a166597c7467d19 /doc/html/globals_func_0x70.html
parent4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff)
parent247579ebf13ead372eee87bd2351078f7219321e (diff)
downloadvolse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.gz
volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.tar.bz2
volse-hubzilla-08b757a22cd2804bfec8ecf682b6987b8c06ca49.zip
Merge branch 'master' into tres
Conflicts: mod/events.php view/css/mod_events.css
Diffstat (limited to 'doc/html/globals_func_0x70.html')
-rw-r--r--doc/html/globals_func_0x70.html9
1 files changed, 3 insertions, 6 deletions
diff --git a/doc/html/globals_func_0x70.html b/doc/html/globals_func_0x70.html
index eee4d88ae..c560ea54f 100644
--- a/doc/html/globals_func_0x70.html
+++ b/doc/html/globals_func_0x70.html
@@ -321,6 +321,9 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
<li>posted_dates()
: <a class="el" href="items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0">items.php</a>
</li>
+<li>prate_init()
+: <a class="el" href="prate_8php.html#a39181c85d6c3f1567aba992c1ad90a4d">prate.php</a>
+</li>
<li>prate_post()
: <a class="el" href="prate_8php.html#af0e041483d1c6451ef5ce5f295e1dbfd">prate.php</a>
</li>
@@ -330,12 +333,6 @@ $(document).ready(function(){initNavTree('globals_func_0x70.html','');});
<li>preg_heart()
: <a class="el" href="text_8php.html#ac19d2b33a58372a357a43d51eed19162">text.php</a>
</li>
-<li>prep_content()
-: <a class="el" href="prep_8php.html#a9a410206b7f229a4c3f6bdb2eb42690a">prep.php</a>
-</li>
-<li>prep_init()
-: <a class="el" href="prep_8php.html#a1889254cb50366e7d6637cf2bbb83799">prep.php</a>
-</li>
<li>prepare_body()
: <a class="el" href="text_8php.html#ae4df74296fbe55051ed3c035e55205e5">text.php</a>
</li>