aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/permissions_8php.js
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2015-01-02 17:27:12 -0800
committerfriendica <info@friendica.com>2015-01-02 17:27:12 -0800
commit14239970a54eacd64a95b21ea24417487ef838df (patch)
treeab62cca45d12256854d30f0da2ed6f2287a922f1 /doc/html/permissions_8php.js
parent3157304bbdd31ceba885bf74da1b31509469a01d (diff)
parented2917118dd97df6b97c6ee34fe77b7f1818ffcd (diff)
downloadvolse-hubzilla-14239970a54eacd64a95b21ea24417487ef838df.tar.gz
volse-hubzilla-14239970a54eacd64a95b21ea24417487ef838df.tar.bz2
volse-hubzilla-14239970a54eacd64a95b21ea24417487ef838df.zip
Merge branch 'master' into trinidad
Diffstat (limited to 'doc/html/permissions_8php.js')
-rw-r--r--doc/html/permissions_8php.js2
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