Sam Tuke a00dd2d5d6 Revert "Revert "Development snapshot"" ... This reverts commit b66d38ecae.		2012-12-11 15:10:56 +00:00
..
ajax	all unit files_encryption crypt unit tests now passing after merge	2012-10-17 16:35:19 +01:00
appinfo	Revert "Revert "Development snapshot""	2012-12-11 15:10:56 +00:00
hooks	Revert "Revert "Development snapshot""	2012-12-11 15:10:56 +00:00
js	typo fixed	2012-08-09 17:56:43 +02:00
l10n	Merged branch 'master'	2012-10-16 16:57:07 +01:00
lib	Revert "Revert "Development snapshot""	2012-12-11 15:10:56 +00:00
templates	disable admin choice of encryption mode once a decision was taken	2012-08-09 14:25:09 +02:00
tests	Revert "Revert "Development snapshot""	2012-12-11 15:10:56 +00:00
settings-personal.php	code cleanup	2012-08-02 13:55:23 +02:00
settings.php	allow user to choose encryption mode	2012-08-02 10:40:32 +02:00