diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2015-01-11 16:22:59 +0100 |
| commit | f0c7612bcd49d32e408e67ac1829ee891c677f7e (patch) | |
| tree | d4cff4aa2d728524b631776ffffee71f42056421 /doc/html/globals_func_0x67.html | |
| parent | 43f143a211c75138d09ceb89acc48ea7d5c31ca9 (diff) | |
| parent | 10102ac2ac4d5b02012a9794e23656717ab05556 (diff) | |
| download | volse-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_func_0x67.html')
| -rw-r--r-- | doc/html/globals_func_0x67.html | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/html/globals_func_0x67.html b/doc/html/globals_func_0x67.html index 7b9781032..305b80312 100644 --- a/doc/html/globals_func_0x67.html +++ b/doc/html/globals_func_0x67.html @@ -224,6 +224,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); <li>get_events() : <a class="el" href="identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312">identity.php</a> </li> +<li>get_feature_default() +: <a class="el" href="features_8php.html#ab9a273de13a12a1c561b380cabaea090">features.php</a> +</li> <li>get_features() : <a class="el" href="features_8php.html#ae73c5b03b01c7284ed7e7e0e774e975c">features.php</a> </li> @@ -317,6 +320,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); <li>get_role_perms() : <a class="el" href="permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe">permissions.php</a> </li> +<li>get_roles() +: <a class="el" href="permissions_8php.html#a6b239a0d494b92a89ce7bf9c7e588991">permissions.php</a> +</li> <li>get_rpost_path() : <a class="el" href="zot_8php.html#a8e22dbc6f884be3644a892a876cbd972">zot.php</a> </li> @@ -347,6 +353,9 @@ $(document).ready(function(){initNavTree('globals_func_0x67.html','');}); <li>get_things() : <a class="el" href="taxonomy_8php.html#a7747fa859ac56fbffd4f9782d85505de">taxonomy.php</a> </li> +<li>get_timezones() +: <a class="el" href="datetime_8php.html#afbb34604d0f6e7d2103da4f42e2487b1">datetime.php</a> +</li> <li>get_words() : <a class="el" href="spam_8php.html#ab8fd81a82c9622cbebb8ceab6b310ca6">spam.php</a> </li> |