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

..

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

Use plural translations

2013-08-09 20:37:18 +02:00

l10n

remove ru_RU - fixes #3135

2013-08-17 11:43:37 +02:00

lib

Merge branch 'master' into decrypt_files_again

2013-08-17 13:15:22 +02:00

templates

Use !== and === in files_trashbin-app

2013-07-10 02:34:00 +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