]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d017bbb e6f8439)
Merge remote-tracking branch 'core/master' into files_encryption
authorFlorin Peter <github@florin-peter.de>
Fri, 26 Apr 2013 15:39:13 +0000 (17:39 +0200)
committerFlorin Peter <github@florin-peter.de>
Fri, 26 Apr 2013 15:39:13 +0000 (17:39 +0200)

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