Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js		2012-07-31 15:00:04 -04:00
..
jquery.fancybox-1.3.4.js	Updated packages	2012-07-26 01:16:22 +02:00
jquery.fancybox-1.3.4.pack.js	Updated packages	2012-07-26 01:16:22 +02:00
jquery.mousewheel-3.0.4.js	non-minified version added	2012-05-12 20:56:29 +02:00
jquery.mousewheel-3.0.4.pack.js	use fancybox instead of lightbox	2011-10-21 20:19:39 +02:00
lightbox.js	Make file actions permissions aware	2012-07-25 16:33:08 -04:00