Björn Schießle 8067a1394e fix merge conflicts		2013-01-28 11:18:04 +01:00
..
files	fix merge conflicts	2013-01-28 11:18:04 +01:00
files_encryption	[tx-robot] updated from transifex	2013-01-28 00:05:43 +01:00
files_external	[tx-robot] updated from transifex	2013-01-27 00:06:21 +01:00
files_sharing	Merge pull request #1321 from owncloud/csp-fixes	2013-01-28 00:29:46 -08:00
files_trashbin	restore file in the root folder if the origin folder is not writable	2013-01-24 15:29:22 +01:00
files_versions	fix merge conflicts	2013-01-28 11:18:04 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-27 00:06:21 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-27 00:06:21 +01:00