Bjoern Schiessle 51295e9a6b Merge branch 'master' into sharing_mail_notification_master ... Conflicts: apps/files/index.php apps/files/templates/index.php		2013-10-04 12:30:49 +02:00
..
files	Merge branch 'master' into sharing_mail_notification_master	2013-10-04 12:30:49 +02:00
files_encryption	Merge pull request #4691 from owncloud/encryption_improved_error_messages_4617	2013-10-04 02:28:18 -07:00
files_external	[tx-robot] updated from transifex	2013-09-18 11:50:02 -04:00
files_sharing	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
files_trashbin	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
files_versions	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00
user_ldap	Merge pull request #4815 from owncloud/ldap_improve_testing	2013-10-04 02:41:06 -07:00
user_webdavauth	[tx-robot] updated from transifex	2013-09-30 10:19:22 -04:00