Michael Gapczynski 702c27b0e6 Merge branch 'master' into external_storage_ui_feedback ... Conflicts: apps/files_external/js/settings.js apps/files_external/lib/smb.php apps/files_external/templates/settings.php lib/files/storage/common.php		2013-02-19 19:12:14 -05:00
..
addMountPoint.php	Show status icons for mount points in external storage UI	2012-12-24 13:45:52 -05:00
addRootCertificate.php	fix redirect, use the new routing	2013-02-18 14:38:29 +01:00
dropbox.php	Check requesttoken	2013-02-12 11:35:16 +01:00
google.php	Check requesttoken	2013-02-12 11:35:16 +01:00
removeMountPoint.php	[files_external] fixing some undefined index	2013-02-11 15:45:10 +01:00
removeRootCertificate.php	Whitespace cleanup	2012-10-14 21:04:08 +02:00