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/permissions_8php.js | |
| 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/permissions_8php.js')
| -rw-r--r-- | doc/html/permissions_8php.js | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/html/permissions_8php.js b/doc/html/permissions_8php.js index 22580253a..824057ac6 100644 --- a/doc/html/permissions_8php.js +++ b/doc/html/permissions_8php.js @@ -4,7 +4,7 @@ var permissions_8php = [ "get_all_perms", "permissions_8php.html#aeca9b280f3dc3358c89976d81d690008", null ], [ "get_perms", "permissions_8php.html#a040fd3d3b8517658b1668ae0cd093972", null ], [ "get_role_perms", "permissions_8php.html#a9b5f5120566a3699a98efc5ccb0c59fe", null ], + [ "get_roles", "permissions_8php.html#a6b239a0d494b92a89ce7bf9c7e588991", null ], [ "perm_is_allowed", "permissions_8php.html#a67ada9ed51e77885b6b0f6a28cee1835", null ], - [ "role_selector", "permissions_8php.html#a50e8099ea8a4d7ed68b2a0a7ea9aa724", null ], [ "site_default_perms", "permissions_8php.html#aa8b7b102c653649d7a71b5a1c044d90d", null ] ];
\ No newline at end of file |