From: Lukas Reschke <lukas@owncloud.com>
Date: Mon, 25 Aug 2014 12:23:28 +0000 (+0200)
Subject: Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset
X-Git-Tag: v8.0.0alpha1~836
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=992b0f9b0619c99b142e1e70d9ddae4a87d21c02;p=nextcloud-server.git

Merge pull request #10598 from owncloud/warn_on_encryption_occ_pwreset

Warn user on resetting passwords via occ when encryption is enabled
---

992b0f9b0619c99b142e1e70d9ddae4a87d21c02