]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 015787f 08d7b8c)
Merge branch 'master' into files_encryption
authorSam Tuke <samtuke@owncloud.com>
Sun, 6 Jan 2013 18:53:32 +0000 (18:53 +0000)
committerSam Tuke <samtuke@owncloud.com>
Sun, 6 Jan 2013 18:53:32 +0000 (18:53 +0000)

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