Merge remote-tracking branch 'origin/develop' into develop

2017-07-06 09:27:31 +00:00
parent 3d167d8a27 0796b304cc
commit efa0184034
1 changed files with 1 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/rooms/_MessageComposer.scss
@@ -97,6 +97,7 @@ limitations under the License.
    flex: 1;
    max-height: 120px;
    overflow: auto;
+    word-break: break-word;
 }

 .mx_MessageComposer_input blockquote {