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
..
get.php	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
list.php	Added translatable text.	2011-10-02 16:06:30 +02:00
settings.php	Allow admin to disable resharing of files	2012-04-25 11:51:30 -04:00