Michael Gapczynski 94ce8f2168 Merge branch 'master' into share_api ... Conflicts: apps/contacts/lib/app.php apps/files_sharing/js/share.js		13 years ago
..
appinfo	remove superfluous ?> at the end of .php files (left out apps/*/templates)	13 years ago
css	Correct image path and apps path replacement	13 years ago
img	use fancybox instead of lightbox	14 years ago
js	Merge branch 'master' into share_api	13 years ago