Michael Gapczynski 30b58f5677 Merge branch 'master' into share_api ... Conflicts: apps/calendar/js/loader.js apps/contacts/index.php apps/contacts/js/loader.js apps/files/js/files.js apps/files_sharing/sharedstorage.php lib/filesystemview.php		2012-07-25 17:08:18 -04:00
..
ajax	small fixes in merge request 104, use OCP\Files::getStorage	2012-07-11 02:33:11 +02:00
appinfo	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
css	shrink css height for gallery_div from 152 to 150 to shrink grey background thumbnail height	2012-07-10 16:58:37 +02:00
img	add supersized slideshow	2012-07-09 15:13:23 +02:00
js	prevent script execution during slideshow	2012-07-11 15:44:39 +02:00
l10n	[tx-robot] updated from transifex	2012-07-25 22:15:24 +02:00
lib	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
templates	add css id attribute, minor fixes	2012-07-09 16:04:46 +02:00
index.php	remove superfluous ?> at the end of .php files (left out apps/*/templates)	2012-07-09 16:51:16 +02:00
sharing.php	removing executable bit - again	2012-05-15 00:52:00 +02:00