Bjoern Schiessle cabe92ef12 Merge branch 'master' into decrypt_files_again ... Conflicts: apps/files_encryption/tests/keymanager.php		2013-08-17 13:15:22 +02:00
..
admin.php	add type=text to ZIP size field, fix second part of #2097	2013-03-06 12:39:36 +01:00
index.php	Merge branch 'master' into decrypt_files_again	2013-08-17 13:15:22 +02:00
part.breadcrumb.php	Migrate to encodePath	2013-07-09 17:46:11 +03:00
part.list.php	finally remove the file size obfuscation as it had more disadvantages. I was wrong, sorry.	2013-07-18 22:15:26 +02:00
upgrade.php	[Files] Use p() instead of echo	2013-02-27 21:14:15 +01:00