]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 20b688d c5c05b8)
Merge branch 'master' into add_ocimage_unittest
authorkondou <kondou@ts.unde.re>
Fri, 2 Aug 2013 11:39:48 +0000 (13:39 +0200)
committerkondou <kondou@ts.unde.re>
Fri, 2 Aug 2013 11:39:48 +0000 (13:39 +0200)

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