Björn Schießle 5cd14425f9 Merge branch 'master' into files_encryption ... Conflicts: apps/files_trashbin/l10n/nn_NO.php		2013-05-21 15:30:19 +02:00
..
ajax	add some error logs to the trash bin app	2013-03-18 12:08:34 +01:00
appinfo	add explenation of the expire function to the apps description	2013-04-16 12:31:33 +02:00
js	Translate 'Error' in core	2013-04-06 16:52:55 +02:00
l10n	Merge branch 'master' into files_encryption	2013-05-21 15:30:19 +02:00
lib	Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption	2013-05-15 10:18:25 +02:00
templates	let the home icon link to the files view in the trash bin	2013-03-07 13:48:02 +01:00
download.php	Trash: fix download.php	2013-02-27 20:31:21 +01:00
index.php	Use $dir instead of $fullpath	2013-05-06 14:28:01 +03:00