diff options
| author | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-02-08 20:57:37 -0800 |
| commit | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (patch) | |
| tree | 477f3a8e84388aab2a4f3c938a166597c7467d19 /doc/html/globals_func_0x67.html | |
| parent | 4b348d248975ba07ba9cea62f51eb52d6afb5645 (diff) | |
| parent | 247579ebf13ead372eee87bd2351078f7219321e (diff) | |
| download | volse-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_0x67.html')
| -rw-r--r-- | doc/html/globals_func_0x67.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index d013170c3..02173b033 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -219,6 +219,9 @@ $(document).ready(function(){initNavTree('globals_func_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> |