server/apps/files_external/ajax
Michael Gapczynski 6eba790a75 Merge branch 'master' into external_storage_ui_feedback
Conflicts:
	apps/files_external/js/dropbox.js
	apps/files_external/js/google.js
	apps/files_external/js/settings.js
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/dropbox.php
	apps/files_external/lib/google.php
	apps/files_external/lib/smb.php
	apps/files_external/lib/swift.php
	apps/files_external/lib/webdav.php
	lib/filestorage.php
2013-02-11 20:27:05 -05:00
..
addMountPoint.php Show status icons for mount points in external storage UI 2012-12-24 13:45:52 -05:00
addRootCertificate.php merge master into filesystem 2012-12-03 18:02:22 +01:00
dropbox.php fix checkstyle for files_external app, add whitespace for readability 2012-11-30 16:27:11 +01:00
google.php fix checkstyle for files_external app, add whitespace for readability 2012-11-30 16:27:11 +01:00
removeMountPoint.php remove superfluous ?> at the end of .php files (left out apps/*/templates) 2012-07-09 16:51:16 +02:00
removeRootCertificate.php Whitespace cleanup 2012-10-14 21:04:08 +02:00