Georg Ehrke a357e5b284 merge conflicts ...		2013-07-10 12:41:53 +02:00
..
ajax	add some error logs to the trash bin app	2013-03-18 12:08:34 +01:00
appinfo	added static function registerHooks() for better unit tests handling	2013-05-22 23:50:45 +02:00
js	use history icon in Deleted Files template as well	2013-06-17 13:30:57 +02:00
l10n	[tx-robot] updated from transifex	2013-07-08 02:09:41 +02:00
lib	merge conflicts ...	2013-07-10 12:41:53 +02:00
templates	merge conflicts ...	2013-07-10 12:41:53 +02:00
download.php	Trash: fix download.php	2013-02-27 20:31:21 +01:00
index.php	Encode current trashbin directory	2013-07-09 17:46:11 +03:00