Georg Ehrke af983b843d fix merge conflicts		2013-08-05 14:27:38 +02:00
..
ajax	Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app	2013-08-02 03:14:24 -07:00
appinfo	added static function registerHooks() for better unit tests handling	2013-05-22 23:50:45 +02:00
js	Merge pull request #3006 from owncloud/===_and_!==_in_files_trashbin-app	2013-08-02 03:14:24 -07:00
l10n	[tx-robot] updated from transifex	2013-08-03 01:56:46 -04:00
lib	fix merge conflicts	2013-08-05 14:27:38 +02:00
templates	fix merge conflicts	2013-08-05 14:27:38 +02:00
download.php	Trash: fix download.php	2013-02-27 20:31:21 +01:00
index.php	Use isIgnoredDir()	2013-07-10 02:36:43 +02:00