Henrik Kjölhede 41fa65e7be Merge branch 'master' of https://github.com/owncloud/core ... Conflicts: apps/files_external/appinfo/app.php		2013-02-09 14:05:33 +07:00
..
files	Merge pull request #1565 from owncloud/fix_replacing	2013-02-09 03:58:06 +07:00
files_encryption	[tx-robot] updated from transifex	2013-02-09 00:14:08 +07:00
files_external	Merge branch 'master' of https://github.com/owncloud/core	2013-02-09 14:05:33 +07:00
files_sharing	[tx-robot] updated from transifex	2013-02-07 00:11:04 +07:00
files_trashbin	[tx-robot] updated from transifex	2013-02-09 00:14:08 +07:00
files_versions	[tx-robot] updated from transifex	2013-02-09 00:14:08 +07:00
user_ldap	[tx-robot] updated from transifex	2013-02-09 00:14:08 +07:00
user_webdavauth	[tx-robot] updated from transifex	2013-02-05 00:20:29 +07:00