Florin Peter 80433fc4c4 Merge branch 'master' into file_encryption_util_is_error ... Conflicts: apps/files_encryption/lib/util.php		2013-05-27 14:41:53 +02:00
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	added l10n support in apps/files_encryption/ajax/adminrecovery.php	2013-05-23 22:09:28 +02:00
appinfo	increase version and add warning	2013-05-25 12:08:18 +02:00
css	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00
hooks	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
js	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
l10n	[tx-robot] updated from transifex	2013-05-27 02:07:24 +02:00
lib	Merge branch 'master' into file_encryption_util_is_error	2013-05-27 14:41:53 +02:00
templates	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
tests	added users for tests	2013-05-26 20:44:15 +02:00
settings-admin.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
settings-personal.php	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00