]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c20319d c5c843b)
Merge branch 'master' into enc
authorRobin Appelman <icewind@owncloud.com>
Wed, 22 Feb 2012 13:26:52 +0000 (14:26 +0100)
committerRobin Appelman <icewind@owncloud.com>
Wed, 22 Feb 2012 13:26:52 +0000 (14:26 +0100)

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