Björn Schießle 4c980a4851 Merge branch 'master' into update-expire-function ... Conflicts: apps/files_trashbin/appinfo/version apps/files_trashbin/lib/trash.php		2013-02-25 14:26:59 +01:00
..
ajax	Whitespace fixes	2013-02-22 19:05:36 +01:00
appinfo	Merge branch 'master' into update-expire-function	2013-02-25 14:26:59 +01:00
js	Whitespace fixes	2013-02-22 19:05:36 +01:00
l10n	[tx-robot] updated from transifex	2013-02-25 00:06:17 +01:00
lib	Merge branch 'master' into update-expire-function	2013-02-25 14:26:59 +01:00
templates	Merge branch 'master' into trashbin_encryption	2013-02-25 12:14:51 +01:00
download.php	debug output removed	2013-01-31 14:48:57 +01:00
index.php	Merge branch 'master' into trashbin_encryption	2013-02-25 12:14:51 +01:00