Sam Tuke ba29147e34 Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax) ... Renamed recovery methods in Util{} for clarity Added note about bug causing slow page load and redundant keypair generation recoveryAdmin functionality not yet complete		2013-05-01 19:21:01 +02:00
..
files	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
files_encryption	Fixed recoveryadmin settings in user and admin settings pages (js, templates, ajax)	2013-05-01 19:21:01 +02:00
files_external	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
files_sharing	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
files_trashbin	merged files_trashbin	2013-05-01 01:52:06 +02:00
files_versions	revert changes to fbbc76f281 because master is very unstable right now	2013-05-01 01:38:06 +02:00
user_ldap	Merge branch 'master' into files_encryption	2013-05-01 09:31:26 +02:00
user_webdavauth	[tx-robot] updated from transifex	2013-04-24 02:01:20 +02:00