]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cdf4bec 763c8f7)
Merge branch 'files_encryption' of https://github.com/owncloud/core into files_encryption
authorFlorin Peter <github@florin-peter.de>
Tue, 7 May 2013 20:19:58 +0000 (22:19 +0200)
committerFlorin Peter <github@florin-peter.de>
Tue, 7 May 2013 20:19:58 +0000 (22:19 +0200)

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