From c20c59add0c061065878d785f815a13682be1bf2 Mon Sep 17 00:00:00 2001
From: adambar <adam.bar@brightinventions.pl>
Date: Fri, 3 Jul 2015 13:49:01 +0200
Subject: [PATCH] Include Ctrl+Enter as one the shortcuts that insert line
 break instead of submitting the message

---
 js/views/conversation_view.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index fa0934d23..a0eb3924b 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -210,7 +210,7 @@
         updateMessageFieldSize: function (event) {
             var keyCode = event.which || event.keyCode;
 
-            if (keyCode === 13 && !event.altKey && !event.shiftKey) {
+            if (keyCode === 13 && !event.altKey && !event.shiftKey && !event.ctrlKey) {
                 // enter pressed - submit the form now
                 event.preventDefault();
                 return this.$('.bottom-bar form').submit();