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	create uploads directory for ssl certificates if it didn't exists	2012-07-09 18:11:29 +02:00
appinfo	Add Dropbox storage backend	2012-06-09 15:02:48 -04:00
css	Working UI for external storage mount configuration	2012-06-08 11:42:29 -04:00
js	allow users to upload ssl root certificates for the webdav client	2012-07-04 17:18:36 +02:00
lib	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
templates	remove hard coded path	2012-07-09 12:49:04 +02:00
tests	Merge branch 'master' into share_api	2012-07-25 17:08:18 -04:00
personal.php	allow users to upload ssl root certificates for the webdav client	2012-07-04 17:18:36 +02:00
settings.php	Fix external storage UI for Admin page	2012-06-28 17:55:22 -04:00