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
..
files	Merge pull request #1613 from owncloud/multiselect-row-width	2013-02-11 11:49:08 -08:00
files_encryption	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
files_external	Merge branch 'master' into external_storage_ui_feedback	2013-02-11 20:27:05 -05:00
files_sharing	Share: fix table head color for public shared folders	2013-02-11 12:35:39 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
files_versions	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
user_ldap	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-02-11 15:42:41 +01:00