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
..
appinfo	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
css	Correct image path and apps path replacement	2012-06-22 13:12:03 +02:00
img	use fancybox instead of lightbox	2011-10-21 20:19:39 +02:00
js	Merge branch 'master' into share_api	2012-07-31 15:00:04 -04:00