From 669747a81c4b2ff823d1f20dc50899163c0a8a4a Mon Sep 17 00:00:00 2001
From: Aleksander Machniak <alec@alec.pl>
Date: Thu, 28 Jun 2012 03:22:31 -0400
Subject: [PATCH] Merge branch 'master' of github.com:roundcube/roundcubemail
---
skins/default/templates/contactedit.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/skins/default/templates/contactedit.html b/skins/default/templates/contactedit.html
index 77e4661..db8599a 100644
--- a/skins/default/templates/contactedit.html
+++ b/skins/default/templates/contactedit.html
@@ -22,7 +22,6 @@
</div>
<roundcube:object name="contactedithead" id="contacthead" size="16" form="editform" />
<div style="clear:both"></div>
-
<div id="contacttabs">
<roundcube:object name="contacteditform" size="40" textareacols="60" deleteIcon="/images/icons/delete.png" form="editform" />
</div>
@@ -34,6 +33,7 @@
</div>
<roundcube:object name="photoUploadForm" id="upload-form" size="30" class="popupmenu" />
+<roundcube:object name="fileDropArea" id="contactpic" />
<script type="text/javascript">rcube_init_tabs('contacttabs')</script>
--
Gitblit v1.9.1