diff options
| author | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
|---|---|---|
| committer | Tony Baldwin <tonybaldwin@gmx.com> | 2014-03-09 19:22:54 -0400 |
| commit | 5cca00ddc79dad667464674e08a2a860e262eabd (patch) | |
| tree | 53df980e32a6706e977a5a2276e0f9aa9ec09300 /doc/html/items_8php.js | |
| parent | 67166180bb560276273a20bcd9ca2a7aae036aba (diff) | |
| parent | a79072ce478a999b06df38ae324fbcef6d3a76e7 (diff) | |
| download | volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.gz volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.tar.bz2 volse-hubzilla-5cca00ddc79dad667464674e08a2a860e262eabd.zip | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
view/theme/redbasic/tpl/theme_settings.tpl
reset to upstream
Diffstat (limited to 'doc/html/items_8php.js')
| -rw-r--r-- | doc/html/items_8php.js | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/html/items_8php.js b/doc/html/items_8php.js index e624f38e6..c6cc17179 100644 --- a/doc/html/items_8php.js +++ b/doc/html/items_8php.js @@ -34,6 +34,7 @@ var items_8php = [ "get_profile_elements", "items_8php.html#a251343637ff40a50cca93452cd530c26", null ], [ "get_public_feed", "items_8php.html#a079e099e15d88d47aeb6ca6d60da7107", null ], [ "has_permissions", "items_8php.html#a77051724d1784074ff187e73a4db93fe", null ], + [ "import_author_rss", "items_8php.html#a6bee35961f2e32905f20367a9309d627", null ], [ "import_author_xchan", "items_8php.html#ae73794179b62d39bb597ff670ab1c1e5", null ], [ "item_expire", "items_8php.html#a6f7e1334af5d684a987fa6a3eb37f4cc", null ], [ "item_getfeedattach", "items_8php.html#a09d425596b9f8663472cf7474ad36d96", null ], @@ -45,12 +46,12 @@ var items_8php = [ "mail_store", "items_8php.html#a77da7ce9a117601d49ac4a67c71b514f", null ], [ "map_scope", "items_8php.html#ac1fcf621dce7370515b420a7753f4726", null ], [ "post_activity_item", "items_8php.html#a410f9c743877c125ca06312373346903", null ], - [ "posted_date_widget", "items_8php.html#abe695dd89e1e10ed042c26b80114f0ed", null ], [ "posted_dates", "items_8php.html#ad2abb4644ff1f20fefbc80326fe01cf0", null ], [ "red_escape_codeblock", "items_8php.html#a49905ea75adfe8a2d110be344d18d6a6", null ], [ "red_escape_zrl_callback", "items_8php.html#a83a349062945d585edb4b3c5d763ab6e", null ], [ "red_unescape_codeblock", "items_8php.html#ad4ee16e3ff1eaf60428c61f82ba25e6a", null ], [ "red_zrl_callback", "items_8php.html#a4e6d7639431e0dd8e9f4dba8e1ac408b", null ], + [ "retain_item", "items_8php.html#af6237605c60d69abdd959ddbbee3420c", null ], [ "send_status_notifications", "items_8php.html#aab9e0c58247427126de0699c729c3b6c", null ], [ "tag_deliver", "items_8php.html#ab1bce4261bcf75ad62753b498a144d17", null ], [ "termtype", "items_8php.html#ad34827ed330898456783fb14c7b46154", null ], |