Michael Gapczynski 78cd1153f0 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/vcard.php apps/files_sharing/sharedstorage.php		2012-08-09 11:38:22 -04:00
..
contacts.css	Merge branch 'master' into share_api	2012-08-09 11:38:22 -04:00
jquery.combobox.css
jquery.Jcrop.css	Correction of path looking for apps and css	2012-06-22 20:58:52 +00:00