]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9dd2775 73e0b4c)
Merge branch 'master' into file_encryption_tests
authorFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 10:54:33 +0000 (12:54 +0200)
committerFlorin Peter <github@florin-peter.de>
Mon, 27 May 2013 10:54:33 +0000 (12:54 +0200)

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