diff options
| author | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
|---|---|---|
| committer | Christian Vogeley <christian.vogeley@hotmail.de> | 2013-12-22 14:31:27 +0100 |
| commit | 870df76463a1cc9823b364db0bfb387f3f46664f (patch) | |
| tree | a8c7391bfe799703aa0a8f26b9ee788f1204e8be /doc/html/Contact_8php.js | |
| parent | 25a533bd72c34e9775af71c010a39db6caf7b633 (diff) | |
| parent | 7e7b5bfa4930493a8feae10b0550e29797956c70 (diff) | |
| download | volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.gz volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.tar.bz2 volse-hubzilla-870df76463a1cc9823b364db0bfb387f3f46664f.zip | |
Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
view/php/theme_init.php
Diffstat (limited to 'doc/html/Contact_8php.js')
| -rw-r--r-- | doc/html/Contact_8php.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/doc/html/Contact_8php.js b/doc/html/Contact_8php.js index e6b927b3a..1de72ccc5 100644 --- a/doc/html/Contact_8php.js +++ b/doc/html/Contact_8php.js @@ -9,8 +9,7 @@ var Contact_8php = [ "channelx_by_n", "Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc", null ], [ "channelx_by_nick", "Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e", null ], [ "contact_remove", "Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6", null ], - [ "contacts_not_grouped", "Contact_8php.html#a228fc01f90ae9bfdde4c2ad0772bd7dc", null ], - [ "random_profile", "Contact_8php.html#a91281b5d4bbbb2ed468e27ec82ca083c", null ], + [ "random_profile", "Contact_8php.html#a852fa476f0c70bde10a4f2533aec5f71", null ], [ "rconnect_url", "Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91", null ], [ "remove_all_xchan_resources", "Contact_8php.html#acc12cda999c88c4d6185cca967c15125", null ], [ "terminate_friendship", "Contact_8php.html#a38daa1c210b78385307123450ca9a1fc", null ], |