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	…
css	…
img	Optimized image size	2012-08-18 13:56:04 +02:00
js	Merge branch 'master' into share_api	2012-07-31 15:00:04 -04:00