From: Björn Schießle <bjoern@schiessle.org>
Date: Mon, 25 Feb 2013 13:13:38 +0000 (-0800)
Subject: Merge pull request #1810 from owncloud/trashbin_encryption
X-Git-Tag: v5.0.0beta2~9
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a37577e007ef458e31d3484b5f969ea0e98545f3;p=nextcloud-server.git

Merge pull request #1810 from owncloud/trashbin_encryption

Trashbin file encryption support
---

a37577e007ef458e31d3484b5f969ea0e98545f3