Henrik Kjölhede b1b2eafa50 Merge remote-tracking branch 'upstream/master' ... Conflicts: apps/files_external/lib/config.php		2013-01-26 21:51:18 +01:00
..
amazons3.php	Whitespace cleanup	2013-01-16 18:09:16 +01:00
config.php	Merge remote-tracking branch 'upstream/master'	2013-01-26 21:51:18 +01:00
dropbox.php	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
ftp.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
sftp.php	Update apps/files_external/lib/sftp.php	2013-01-26 19:46:23 +01:00
smb.php	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
streamwrapper.php	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
swift.php	fix checkstyle for files_external app, add whitespace for readability	2012-11-30 16:27:11 +01:00
webdav.php	Merge branch 'master' into fixing-unused-and-undefined-in-master	2013-01-14 23:41:34 +01:00