Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -04:00
..
appinfo	mark the apps as part of the shipped package and increase the requirement to ownCloud 4	2012-05-18 16:06:57 +02:00
js	Make file actions permissions aware	2012-07-25 16:33:08 -04:00
lib	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
tests	improve tar archive backend	2012-05-18 01:54:59 +02:00