Thomas Müller 15d1df055b Merge branch 'master' into display-share-owner-master ... Conflicts: apps/files_sharing/lib/cache.php		2014-02-28 14:54:10 +01:00
..
files	Merge branch 'master' into display-share-owner-master	2014-02-28 14:54:10 +01:00
files_encryption	Merge pull request #7454 from owncloud/enc_remember_fopen_mode	2014-02-28 09:57:58 +01:00
files_external	Merge pull request #7335 from owncloud/fix-7333	2014-02-25 15:27:47 +01:00
files_sharing	Merge branch 'master' into display-share-owner-master	2014-02-28 14:54:10 +01:00
files_trashbin	Fixed trashbin title	2014-02-20 15:16:45 +01:00
files_versions	Scrutinizer Auto-Fixes	2014-02-19 09:31:54 +01:00
user_ldap	Merge pull request #6299 from leo-b/ldap_nested_groups	2014-02-25 15:41:10 +02:00
user_webdavauth	[tx-robot] updated from transifex	2014-01-04 01:55:57 -05:00