aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x73.html
diff options
context:
space:
mode:
authorChristian Vogeley <christian.vogeley@hotmail.de>2015-01-11 16:22:59 +0100
committerChristian Vogeley <christian.vogeley@hotmail.de>2015-01-11 16:22:59 +0100
commitf0c7612bcd49d32e408e67ac1829ee891c677f7e (patch)
treed4cff4aa2d728524b631776ffffee71f42056421 /doc/html/globals_0x73.html
parent43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff)
parent10102ac2ac4d5b02012a9794e23656717ab05556 (diff)
downloadvolse-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_0x73.html')
-rw-r--r--doc/html/globals_0x73.html3
1 files changed, 0 insertions, 3 deletions
diff --git a/doc/html/globals_0x73.html b/doc/html/globals_0x73.html
index 03522e36b..dadbc4e5d 100644
--- a/doc/html/globals_0x73.html
+++ b/doc/html/globals_0x73.html
@@ -177,9 +177,6 @@ $(document).ready(function(){initNavTree('globals_0x73.html','');});
<li>searchbox()
: <a class="el" href="text_8php.html#aae91e4d2a2c6f7a9daccd2c186ae3447">text.php</a>
</li>
-<li>select_timezone()
-: <a class="el" href="datetime_8php.html#a633dadba426fa2f60b25fabdb19ebc1f">datetime.php</a>
-</li>
<li>send_message()
: <a class="el" href="include_2message_8php.html#a751ffd6635022b2190f56154ee745752">message.php</a>
</li>