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
..
data	Optimized image size	2012-08-18 13:56:04 +02:00
lib	Merge branch 'share_api'	2012-08-19 22:29:01 -04:00
index.php	fix running test cases from browser	2012-07-19 16:19:23 +02:00