]> source.dussan.org Git - nextcloud-server.git/commitdiff
projects / nextcloud-server.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ebe3ae5 e0a058c)
Fixed merge conflict in /files/ajax/move.php
authorTom Needham <needham.thomas@gmail.com>
Wed, 4 Jan 2012 16:31:06 +0000 (16:31 +0000)
committerTom Needham <needham.thomas@gmail.com>
Wed, 4 Jan 2012 16:31:06 +0000 (16:31 +0000)

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