Sam Tuke aa648fca75 Merge branch 'master' into files_encryption ... Conflicts: apps/files_encryption/templates/settings.php		2013-01-22 17:31:05 +00:00
..
files	[tx-robot] updated from transifex	2013-01-21 00:05:34 +01:00
files_encryption	Added localisation for encryption settings	2013-01-22 17:15:03 +00:00
files_external	Whitespace cleanup	2013-01-16 18:09:16 +01:00
files_sharing	Whitespace cleanup	2013-01-16 18:09:16 +01:00
files_versions	Spaces to tabs	2013-01-16 18:09:16 +01:00
user_ldap	[tx-robot] updated from transifex	2013-01-21 00:05:34 +01:00
user_webdavauth	[tx-robot] updated from transifex	2013-01-21 00:05:34 +01:00