]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9bdad6f b5889d6)
fix merge conflicts
authorGeorg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 19:40:05 +0000 (21:40 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Wed, 13 Jun 2012 19:40:05 +0000 (21:40 +0200)

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