Michael Gapczynski 82d81e8d39 Merge branch 'share_api' ... Conflicts: apps/contacts/lib/vcard.php apps/files/index.php lib/files.php		2012-08-19 22:29:01 -04:00
..
ajax	XSRF checks	2012-08-10 00:44:35 +02:00
appinfo	Add Dropbox storage backend	2012-06-09 15:02:48 -04:00
css	Fix remove button display for external storage	2012-08-13 17:10:58 -04:00
js	Improve usability for configuring Dropbox and Google Drive external storage	2012-08-13 17:10:58 -04:00
l10n	[tx-robot] updated from transifex	2012-08-20 02:01:32 +02:00
lib	Merge branch 'master' into share_api	2012-08-14 10:22:13 -04:00
templates	Improve usability for configuring Dropbox and Google Drive external storage	2012-08-13 17:10:58 -04: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