Thomas Müller c6f4f85e27 Merge branch 'master' into scrutinizer_documentation_patches ... Conflicts: lib/private/migration/content.php		2014-02-18 18:31:33 +01:00
..
files	Merge pull request #7190 from owncloud/appconfig-legacy-apps	2014-02-18 18:10:22 +01:00
files_encryption	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
files_external	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
files_sharing	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
files_trashbin	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
files_versions	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
user_ldap	Merge branch 'master' into scrutinizer_documentation_patches	2014-02-18 18:31:33 +01:00
user_webdavauth	[tx-robot] updated from transifex	2014-01-04 01:55:57 -05:00