From a0ab700ca6363dd1a1f77e84be6a8bc7ac79f244 Mon Sep 17 00:00:00 2001
From: Ben Gotow <bengotow@gmail.com>
Date: Tue, 27 Sep 2016 14:36:55 -0700
Subject: [PATCH] =?UTF-8?q?=F0=9F=92=84(mail-merge):=20Fix=20alignment=20a?=
 =?UTF-8?q?nd=20height=20of=20tokens?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal_packages/composer/stylesheets/composer.less | 1 +
 src/pro                                              | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/internal_packages/composer/stylesheets/composer.less b/internal_packages/composer/stylesheets/composer.less
index cae1c8b84..40e581c7b 100644
--- a/internal_packages/composer/stylesheets/composer.less
+++ b/internal_packages/composer/stylesheets/composer.less
@@ -487,6 +487,7 @@ body.platform-win32 {
   left: 0;
   width: 100%;
   height: 0;
+  line-height: 1.4; // must match contenteditable container
   overflow: visible;
   z-index: 10;
 }
diff --git a/src/pro b/src/pro
index 148f45258..6790434a5 160000
--- a/src/pro
+++ b/src/pro
@@ -1 +1 @@
-Subproject commit 148f4525863e7827a9e8898720107b295ef432e1
+Subproject commit 6790434a56da15bcc1cfcba5f629bf3a5808f49d