]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e7de254 eb4cd86)
Fix merge conflicts
authorTom Needham <needham.thomas@gmail.com>
Sun, 1 Jan 2012 01:18:02 +0000 (01:18 +0000)
committerTom Needham <needham.thomas@gmail.com>
Sun, 1 Jan 2012 01:18:02 +0000 (01:18 +0000)

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