From: Björn Schießle <bjoern@schiessle.org>
Date: Wed, 16 Oct 2013 08:34:05 +0000 (-0700)
Subject: Merge pull request #5333 from owncloud/avater_with_encryption
X-Git-Tag: v6.0.0alpha2~1
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=ada94fb5581569b24ae4f2ffcf6fdf46d7b67f84;p=nextcloud-server.git

Merge pull request #5333 from owncloud/avater_with_encryption

avatars should also work with encryption after pr #5332 was merged
---

ada94fb5581569b24ae4f2ffcf6fdf46d7b67f84