summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorLukas Reschke <lukas@owncloud.com>2015-09-15 19:29:06 +0200
committerLukas Reschke <lukas@owncloud.com>2015-09-15 19:29:06 +0200
commit82c2e0df7c1c919aea0fed957e70d4eaadb3392d (patch)
tree2af23c94a19a1f4d2cd5cbeaca5c86044403034a /apps
parentcb529acc5ca25ce34d41a89c6280a170780d14c2 (diff)
parent9883d5b85d8ae1e2d1d58b345c96a0563e112b97 (diff)
downloadnextcloud-server-82c2e0df7c1c919aea0fed957e70d4eaadb3392d.tar.gz
nextcloud-server-82c2e0df7c1c919aea0fed957e70d4eaadb3392d.zip
Merge branch 'master' into version-retention
Diffstat (limited to 'apps')
-rw-r--r--apps/encryption/lib/crypto/encryption.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/apps/encryption/lib/crypto/encryption.php b/apps/encryption/lib/crypto/encryption.php
index d2925e1b6be..c62afac83c1 100644
--- a/apps/encryption/lib/crypto/encryption.php
+++ b/apps/encryption/lib/crypto/encryption.php
@@ -421,10 +421,9 @@ class Encryption implements IEncryptionModule {
*
* @param InputInterface $input
* @param OutputInterface $output write some status information to the terminal during encryption
- * @return bool
*/
public function encryptAll(InputInterface $input, OutputInterface $output) {
- return $this->encryptAll->encryptAll($input, $output);
+ $this->encryptAll->encryptAll($input, $output);
}
/**