]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ca6a77d d7dc710)
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Fri, 17 May 2013 09:20:17 +0000 (11:20 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Fri, 17 May 2013 09:20:17 +0000 (11:20 +0200)
1  2 
apps/files_encryption/lib/util.php patch | diff1 | diff2 | blob | history

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