diff options
| author | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
|---|---|---|
| committer | Stefan Parviainen <saparvia@caterva.eu> | 2014-11-08 20:53:41 +0100 |
| commit | b5fad9feefd0f261807222d8a4c42ead6253a65c (patch) | |
| tree | 399cd4a1b79f61530924ea59670af0bdd6cee5be /doc/html/globals_0x67.html | |
| parent | 89aea081825ec7b11b00833a9bec2c74900bfcb6 (diff) | |
| parent | b29a968be8df52cd7c9b6d5bebb618534788337c (diff) | |
| download | volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.gz volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.tar.bz2 volse-hubzilla-b5fad9feefd0f261807222d8a4c42ead6253a65c.zip | |
Fix merge conflict
Diffstat (limited to 'doc/html/globals_0x67.html')
| -rw-r--r-- | doc/html/globals_0x67.html | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/html/globals_0x67.html b/doc/html/globals_0x67.html index 97c4bc683..f71204ab9 100644 --- a/doc/html/globals_0x67.html +++ b/doc/html/globals_0x67.html @@ -183,6 +183,9 @@ $(document).ready(function(){initNavTree('globals_0x67.html','');}); <li>get_channel_by_nick() : <a class="el" href="identity_8php.html#ac73b3e13778c564c877554517a7f51ba">identity.php</a> </li> +<li>get_channel_default_perms() +: <a class="el" href="identity_8php.html#a293f416ce9050220b183e08ff5890216">identity.php</a> +</li> <li>get_cloudpath() : <a class="el" href="include_2attach_8php.html#a6aa00ea010ea030110faefb75eafc1ce">attach.php</a> </li> |