aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x67.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_0x67.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_0x67.html')
-rw-r--r--doc/html/globals_0x67.html3
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html
index 4fe855ccb..bcd7cdf5c 100644
--- a/doc/html/globals_0x67.html
+++ b/doc/html/globals_0x67.html
@@ -220,6 +220,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');});
<li>get_dim()
: <a class="el" href="datetime_8php.html#a7df24d72ea05922d3127363e2295174c">datetime.php</a>
</li>
+<li>get_directory_primary()
+: <a class="el" href="boot_8php.html#a07a9d3910794df1c98ad2017e6a8e4b9">boot.php</a>
+</li>
<li>get_directory_realm()
: <a class="el" href="boot_8php.html#a329400dcb29897cdaae3020109272285">boot.php</a>
</li>