server/apps/gallery/lib
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
..
album.php remove unused variables 2012-07-20 18:56:18 +02:00
hooks_handlers.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
images_utils.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
managers.php remove unused variables 2012-07-20 18:56:18 +02:00
photo.php small fixes in merge request 104, use OCP\Files::getStorage 2012-07-11 02:33:11 +02:00
scanner.php fixed wrong function call 2012-06-06 10:40:22 +02:00
share.php Merge branch 'master' into share_api 2012-07-25 17:08:18 -04:00
sharing.php removing executable bit - again 2012-05-15 00:52:00 +02:00
tiles.php remove unused variables 2012-07-20 18:56:18 +02:00
tiles_test.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00