]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge pull request #15481 from owncloud/enc_no_error_if_enc_is_disabled
authorVincent Petry <pvince81@owncloud.com>
Wed, 8 Apr 2015 16:50:40 +0000 (18:50 +0200)
committerVincent Petry <pvince81@owncloud.com>
Wed, 8 Apr 2015 16:50:40 +0000 (18:50 +0200)
don't throw exception if a file gets uploaded and encryption is disabled


Trivial merge