Bjoern Schiessle 4d79e7e673 Merge branch 'master' into encryption_improved_error_messages_4617		2013-09-30 15:08:53 +02:00
..
files	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-30 15:08:53 +02:00
files_encryption	Merge branch 'master' into encryption_improved_error_messages_4617	2013-09-30 15:08:53 +02:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	Merge branch 'master' into appframework-master	2013-09-27 14:25:47 +02:00
files_trashbin	Merge branch 'master' into appframework-master	2013-09-27 14:25:47 +02:00
files_versions	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
user_ldap	[tx-robot] updated from transifex	2013-09-27 00:02:30 -04:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00