Jan-Christoph Borchardt 2be2a5d2c5 external storage: fix merge conflict, indentation		2014-03-31 13:12:04 +02:00
..
files	external storage: fix merge conflict, indentation	2014-03-31 13:12:04 +02:00
files_encryption	external storage: fix merge conflict, indentation	2014-03-31 13:12:04 +02:00
files_external	external storage: fix merge conflict, indentation	2014-03-31 13:12:04 +02:00
files_sharing	Merge pull request #7879 from owncloud/sharing_cleanup_public_api	2014-03-28 12:23:11 +01:00
files_trashbin	Merge pull request #7872 from owncloud/trash-disablestoragestats	2014-03-28 11:22:19 +01:00
files_versions	Merge pull request #7724 from owncloud/mobile	2014-03-28 10:27:15 +01:00
user_ldap	external storage: fix merge conflict, indentation	2014-03-31 13:12:04 +02:00
user_webdavauth	replace personalblock fieldset with section class in core user_ apps	2014-03-27 17:00:47 +01:00