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
..
app.php	Merge branch 'master' into share_api	2012-07-11 20:25:59 -04:00
database.xml	Correct db default value.	2012-07-05 00:40:11 +02:00
info.xml	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
migrate.php	Updates contacts migration provider	2012-06-30 22:56:47 +00:00
remote.php	Implemented VCFExportPlugin.	2012-07-08 17:52:57 +02:00
update.php	Missing update script.	2012-07-04 22:58:31 +02:00
version	Remove ugly activation hack.	2012-07-04 22:13:36 +02:00