Sam Tuke 1641ed8ac7 Merge branch 'master' into files_encryption		2013-01-14 16:54:25 +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	Merge branch 'master' into files_encryption	2013-01-14 16:54:25 +00:00
lib	Added creation of dir for shared file env encryption keys	2013-01-14 15:39:04 +00:00
templates	cleaning up the settings. standardize the format, add missing I10N and other small things. Yes. This is not perfect. But way better than before ;-)	2012-12-15 20:02:16 +01:00
test	All in-use unit tests now passing after merge	2013-01-06 18:38:35 +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