Michael Gapczynski 4bf13adff2 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/addressbook.php apps/files_sharing/js/share.js apps/files_sharing/sharedstorage.php		2012-07-11 20:25:59 -04:00
..
VCFExportPlugin.php	Simplify VCF generation.	2012-07-08 23:36:52 +02:00
addressbook.php	Merge branch 'master' into share_api	2012-07-11 20:25:59 -04:00
app.php	Merge branch 'master' into share_api	2012-07-11 20:25:59 -04:00
connector_sabre.php	Revert reversion of f5c329af98 :-P	2012-07-10 01:24:40 +02:00
hooks.php	fix birthday calendar	2012-06-29 15:43:18 +02:00
search.php	Cast translation to string.	2012-06-22 14:27:46 +02:00
share.php	Fix addressbook sharing, formatItems() changed in past commits	2012-07-11 11:33:48 -04:00
vcard.php	Load contactlist progressivly.	2012-06-27 22:44:28 +02:00