From: Björn Schießle Date: Fri, 14 Jun 2013 08:38:15 +0000 (-0700) Subject: Merge pull request #3715 from owncloud/fixes_for_3641_3620 X-Git-Tag: v6.0.0alpha2~635 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=a8a60d761b12d59923e70da06f0b84954c2e3ec7;p=nextcloud-server.git Merge pull request #3715 from owncloud/fixes_for_3641_3620 files_encryption: bug fixes for reported problems. --- a8a60d761b12d59923e70da06f0b84954c2e3ec7