Thomas Müller 3587c88fe9 Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master ... Conflicts: apps/files/js/file-upload.js		2014-04-07 22:28:16 +02:00
..
files	Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master	2014-04-07 22:28:16 +02:00
files_encryption	[tx-robot] updated from transifex	2014-04-06 01:56:11 -04:00
files_external	[tx-robot] updated from transifex	2014-04-07 01:56:11 -04:00
files_sharing	[tx-robot] updated from transifex	2014-04-07 01:56:11 -04:00
files_trashbin	Files, trashbin, public apps use ajax/JSON for the file list	2014-04-02 15:33:47 +02:00
files_versions	Merge pull request #7724 from owncloud/mobile	2014-03-28 10:27:15 +01:00
user_ldap	Merge pull request #6221 from leo-b/ldap_get_all_groups	2014-04-07 13:00:32 +02:00
user_webdavauth	replace personalblock fieldset with section class in core user_ apps	2014-03-27 17:00:47 +01:00