aboutsummaryrefslogtreecommitdiffstats
path: root/doc/html/globals_0x67.html
diff options
context:
space:
mode:
authorHabeas Codice <habeascodice@federated.social>2014-11-13 13:06:31 -0800
committerHabeas Codice <habeascodice@federated.social>2014-11-13 13:06:31 -0800
commitac27db22c18ee7a82a52cbadb3efe2760b910499 (patch)
treeaa7002d73dbcd4136033589f1cb135184f4126c1 /doc/html/globals_0x67.html
parent1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff)
parent109cb936632c693d3f24afb9e2ce533797ad1a7f (diff)
downloadvolse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.gz
volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.tar.bz2
volse-hubzilla-ac27db22c18ee7a82a52cbadb3efe2760b910499.zip
Merge remote-tracking branch 'upstream/master'
Conflicts: boot.php include/dba/dba_driver.php include/diaspora.php include/follow.php include/session.php include/zot.php mod/photos.php mod/ping.php
Diffstat (limited to 'doc/html/globals_0x67.html')
-rw-r--r--doc/html/globals_0x67.html3
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>