]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a2ba3c8 6b47da1)
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Mon, 22 Apr 2013 09:59:26 +0000 (11:59 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Mon, 22 Apr 2013 09:59:26 +0000 (11:59 +0200)

Trivial merge
Nextcloud server, a safe home for all your data: https://github.com/nextcloud/server