Florin Peter 1bfe975938 Merge branch 'master' into files_encryption_upgrade_fix ... Conflicts: apps/files_encryption/lib/util.php		2013-05-31 12:58:12 +02:00
..
3rdparty/Crypt_Blowfish	move 3rdparty dependencies to app	2013-05-21 10:30:24 +02:00
ajax	changed " to '	2013-05-29 23:11:30 +02:00
appinfo	fix for autoloader while user logged in and system is in maintenance	2013-05-31 01:34:31 +02:00
css	Added facility to manually encrypt all files from personal settings	2013-05-07 16:17:38 +02:00
hooks	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00
js	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
l10n	[tx-robot] updated from transifex	2013-05-31 02:04:40 +02:00
lib	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00
templates	fixes after review from @DeepDiver1975	2013-05-23 23:56:31 +02:00
tests	Merge branch 'master' into files_encryption_upgrade_fix	2013-05-31 12:58:12 +02:00
settings-admin.php	reformat code	2013-05-29 23:13:45 +02:00
settings-personal.php	reformat code	2013-05-29 23:13:45 +02:00