From: VicDeo <dubiniuk@owncloud.com>
Date: Mon, 7 Oct 2013 15:19:40 +0000 (-0700)
Subject: Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
X-Git-Tag: v6.0.0alpha2~71
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=d8b7e42fc1626c64a28a31cfbde4a3789b9097bf;p=nextcloud-server.git

Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes

File conflicts dialog fixes
---

d8b7e42fc1626c64a28a31cfbde4a3789b9097bf