diff options
| author | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2015-04-23 19:49:41 -0700 |
| commit | 6679734135fb04f4a7beccb81663bf1e9574f062 (patch) | |
| tree | 887488543d98b5dd297d917718bdd99844e83ba5 /doc/html/Contact_8php.js | |
| parent | 08b757a22cd2804bfec8ecf682b6987b8c06ca49 (diff) | |
| parent | c696860cc53bc25558d83de5eda65d9b583da382 (diff) | |
| download | volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.gz volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.tar.bz2 volse-hubzilla-6679734135fb04f4a7beccb81663bf1e9574f062.zip | |
Merge branch 'master' into tres
Conflicts:
include/Contact.php
include/ItemObject.php
include/api.php
include/attach.php
include/diaspora.php
include/dir_fns.php
include/enotify.php
include/event.php
include/expire.php
include/items.php
include/notifier.php
include/notify.php
include/photos.php
include/taxonomy.php
include/text.php
include/widgets.php
include/zot.php
mod/admin.php
mod/channel.php
mod/dirsearch.php
mod/display.php
mod/editwebpage.php
mod/events.php
mod/home.php
mod/item.php
mod/manage.php
mod/mood.php
mod/network.php
mod/page.php
mod/photos.php
mod/ping.php
mod/post.php
mod/thing.php
mod/viewsrc.php
view/css/mod_events.css
Diffstat (limited to 'doc/html/Contact_8php.js')
| -rw-r--r-- | doc/html/Contact_8php.js | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/doc/html/Contact_8php.js b/doc/html/Contact_8php.js deleted file mode 100644 index 556236836..000000000 --- a/doc/html/Contact_8php.js +++ /dev/null @@ -1,19 +0,0 @@ -var Contact_8php = -[ - [ "abook_connections", "Contact_8php.html#ae8803c330352cbf1e828eb7490edf47e", null ], - [ "abook_self", "Contact_8php.html#ad5b02c2a962ee55b1b7ca6c159d6e4c5", null ], - [ "abook_toggle_flag", "Contact_8php.html#a024919623a830e8703ac4f23496dd66c", null ], - [ "account_remove", "Contact_8php.html#a5101d7eca5d6f387e5555f03fe249e33", null ], - [ "channel_remove", "Contact_8php.html#a4e8af0f0525161da74583c04b8b03097", null ], - [ "channelx_by_hash", "Contact_8php.html#a483cda56f9e37c3a4a8773dcdfeb0258", null ], - [ "channelx_by_n", "Contact_8php.html#a3a0844dac1e86d523de5d2f432cfeebc", null ], - [ "channelx_by_nick", "Contact_8php.html#a87e699f74a1102b25e8aa0432d86a91e", null ], - [ "contact_remove", "Contact_8php.html#a28e062c884331dbb5dfa713228c25ad6", null ], - [ "mark_orphan_hubsxchans", "Contact_8php.html#a08845ce8c5b997d5edac38ae7118b5c8", null ], - [ "random_profile", "Contact_8php.html#a7e3f5bef8ea1d2bf8434c9be36a2b713", null ], - [ "rconnect_url", "Contact_8php.html#a2f4f495d53f2a334ab75292af79d3c91", null ], - [ "remove_all_xchan_resources", "Contact_8php.html#acc12cda999c88c4d6185cca967c15125", null ], - [ "rrmdir", "Contact_8php.html#ab5895b75a3b2abdddf1cb351a8c6b58b", null ], - [ "user_remove", "Contact_8php.html#a2fc191067dd571a79603c66b04b1ca15", null ], - [ "vcard_from_xchan", "Contact_8php.html#a6348a532c9d26cd1c9afbc9aa6aa8960", null ] -];
\ No newline at end of file |