From: Vincent Petry Date: Wed, 8 Apr 2015 16:50:40 +0000 (+0200) Subject: Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled X-Git-Tag: v8.1.0alpha1~67 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=053c15d1a7525d4b5e2b88dc9838efcdef1ed6be;p=nextcloud-server.git Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled don't throw exception if a file gets uploaded and encryption is disabled --- 053c15d1a7525d4b5e2b88dc9838efcdef1ed6be