diff options
| author | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
|---|---|---|
| committer | Habeas Codice <habeascodice@federated.social> | 2014-11-13 13:06:31 -0800 |
| commit | ac27db22c18ee7a82a52cbadb3efe2760b910499 (patch) | |
| tree | aa7002d73dbcd4136033589f1cb135184f4126c1 /doc/html/identity_8php.js | |
| parent | 1a5a5c7edb8697c93f8bababbafa80245378dd7e (diff) | |
| parent | 109cb936632c693d3f24afb9e2ce533797ad1a7f (diff) | |
| download | volse-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/identity_8php.js')
| -rw-r--r-- | doc/html/identity_8php.js | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/html/identity_8php.js b/doc/html/identity_8php.js index ead11cd4c..92b4f2c38 100644 --- a/doc/html/identity_8php.js +++ b/doc/html/identity_8php.js @@ -6,6 +6,7 @@ var identity_8php = [ "create_sys_channel", "identity_8php.html#a1cf83ac2b645de12868edaa3a5718f05", null ], [ "get_birthdays", "identity_8php.html#ad2c97627a313d53df1a1c7b4215ddb51", null ], [ "get_channel_by_nick", "identity_8php.html#ac73b3e13778c564c877554517a7f51ba", null ], + [ "get_channel_default_perms", "identity_8php.html#a293f416ce9050220b183e08ff5890216", null ], [ "get_default_profile_photo", "identity_8php.html#ab1485a26b032956e1496fc08c58b83ed", null ], [ "get_events", "identity_8php.html#ae381db3d43f8e7c1da8b15d14ecf5312", null ], [ "get_my_address", "identity_8php.html#a490972c02fdb638c52ec0e012a30bfd2", null ], |