]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 63a1b06 5ac10a9)
Merge branch 'master' into calendar_dropimport
authorGeorg Ehrke <dev@georgswebsite.de>
Sun, 13 May 2012 13:06:02 +0000 (15:06 +0200)
committerGeorg Ehrke <dev@georgswebsite.de>
Sun, 13 May 2012 13:06:02 +0000 (15:06 +0200)

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