]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 14d0903 d95fc4e)
Merge branch 'files_encryption'
authorSam Tuke <samtuke@owncloud.com>
Wed, 23 Jan 2013 12:54:09 +0000 (12:54 +0000)
committerSam Tuke <samtuke@owncloud.com>
Wed, 23 Jan 2013 12:54:09 +0000 (12:54 +0000)

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