]> source.dussan.org Git - nextcloud-server.git/commitdiff
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
authorFlorin Peter <github@florin-peter.de>
Mon, 22 Apr 2013 16:51:11 +0000 (18:51 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 22 Apr 2013 16:51:11 +0000 (18:51 +0200)
1  2 
apps/files_encryption/lib/proxy.php
apps/files_encryption/lib/util.php

Simple merge
Simple merge