Sam Tuke 3b9e2f1bab Merge branch 'master' into files_encryption-style-fixes ... Conflicts: apps/files_encryption/lib/crypt.php apps/files_encryption/lib/keymanager.php		2013-02-05 18:43:55 +00:00
..
files	Remove undefined crumb variable from home breadcrumb	2013-02-04 20:40:16 -05:00
files_encryption	Merge branch 'master' into files_encryption-style-fixes	2013-02-05 18:43:55 +00:00
files_external	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
files_sharing	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
files_trashbin	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
files_versions	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
user_ldap	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00