Vincent Petry b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig ... Fix merging of external storage configurations		2014-03-26 14:30:35 +01:00
..
files	[tx-robot] updated from transifex	2014-03-26 01:56:21 -04:00
files_encryption	[tx-robot] updated from transifex	2014-03-24 01:55:51 -04:00
files_external	Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig	2014-03-26 14:30:35 +01:00
files_sharing	Merge pull request #7477 from owncloud/foldersize-reuse	2014-03-25 22:33:24 +01:00
files_trashbin	Merge pull request #7768 from owncloud/trashempty-nocache	2014-03-24 13:34:30 +01:00
files_versions	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00
user_ldap	[tx-robot] updated from transifex	2014-03-26 01:56:21 -04:00
user_webdavauth	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00