]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: baa6fd6 b7d8da8)
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
authorFlorin Peter <github@florin-peter.de>
Tue, 23 Apr 2013 17:09:01 +0000 (19:09 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 23 Apr 2013 17:09:01 +0000 (19:09 +0200)
1  2 
apps/files_encryption/lib/proxy.php patch | diff1 | diff2 | blob | history

diff --cc apps/files_encryption/lib/proxy.php
Simple merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server