Sam Tuke cd832935e8 Merge branch 'files_encryption'		2013-01-23 12:54:09 +00:00
..
ajax	all unit files_encryption crypt unit tests now passing after merge	2012-10-17 16:35:19 +01:00
appinfo	Adding sharing support: added new method in Keymanager setShareKey()	2013-01-14 19:07:28 +00:00
hooks	Adding sharing support: added new method in Keymanager setShareKey()	2013-01-14 19:07:28 +00:00
js	Add missing ; to js code	2012-09-05 22:26:09 +02:00
l10n	[tx-robot] updated from transifex	2013-01-23 00:06:18 +01:00
lib	Adding sharing support: added new method in Keymanager setShareKey()	2013-01-14 19:07:28 +00:00
templates	Added localisation for encryption settings	2013-01-22 17:15:03 +00:00
test	Adding sharing support: added new method in Keymanager setShareKey()	2013-01-14 19:07:28 +00:00
settings-personal.php	code cleanup	2012-08-02 13:55:23 +02:00
settings.php	Re-added 'checkAdminUser'	2013-01-10 18:04:52 +00:00