From fc52af24f1418d6590a2d37a0d8cc31b123e38f6 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Tue, 19 Aug 2014 12:08:35 -0400
Subject: [PATCH] Fix merge error that disabled contact drag'n'drop

---
 skins/larry/templates/contact.html |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/skins/larry/templates/contact.html b/skins/larry/templates/contact.html
index d252049..59fe6f7 100644
--- a/skins/larry/templates/contact.html
+++ b/skins/larry/templates/contact.html
@@ -13,7 +13,7 @@
 		<div id="sourcename"><roundcube:label name="addressbook" />: <roundcube:var name="env:sourcename" /></div>
 	<roundcube:endif />
 
-	<div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" /></div>
+	<div id="contactphoto"><roundcube:object name="contactphoto" id="contactpic" placeholder="/images/contactpic.png" placeholderGroup="/images/contactgroup.png" /></div>
 	<roundcube:object name="contacthead" id="contacthead" />
 	<br style="clear:both" />
 

--
Gitblit v1.9.1