]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8ae2fa 137039d)
Merge branch 'files_encryption' of github.com:owncloud/core into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Wed, 15 May 2013 09:42:41 +0000 (11:42 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Wed, 15 May 2013 09:42:41 +0000 (11:42 +0200)

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