[Pkg-owncloud-commits] [owncloud] 248/457: Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch stable8
in repository owncloud.

commit d2f3710ede1fa72658a4c12264a90a1936faf9ca
Merge: cf2c599 f05ac47
Author: Morris Jobke <hey at morrisjobke.de>
Date:   Tue Jun 2 09:36:51 2015 +0200

    Merge pull request #16623 from owncloud/oparoz-fix-file-conflict-preview
    
    Get a 96x96 preview for file conflict resolution

 core/js/oc-dialogs.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git