]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 46c784c 6988625)
Merge branch 'master' into files_encryption
authorBjörn Schießle <schiessle@owncloud.com>
Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)
committerBjörn Schießle <schiessle@owncloud.com>
Thu, 23 May 2013 09:11:57 +0000 (11:11 +0200)

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