Sam Tuke a528f96b84 Merge branch 'master' into files_encryption-style-fixes		2013-02-05 18:23:03 +00:00
..
ajax	all unit files_encryption crypt unit tests now passing after merge	2012-10-17 16:35:19 +01:00
appinfo	Merge branch 'master' into files_encryption	2012-12-12 17:39:43 +00:00
hooks	All in-use unit tests now passing after merge	2013-01-06 18:38:35 +00:00
js	Add missing ; to js code	2012-09-05 22:26:09 +02:00
l10n	[tx-robot] updated from transifex	2013-02-05 00:20:29 +01:00
lib	Fixed todos: undefined vars and unreachable code	2013-02-05 13:12:34 +00:00
templates	Added localisation for encryption settings	2013-01-22 17:15:03 +00:00
test	drop SimpleTest compatibility	2013-01-24 16:47:17 +01: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