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

2017-07-03 08:57:59 +00:00
parent 657e195455 5d4b98d4f6
commit 5475f8ffbd
1 changed files with 4 additions and 0 deletions
--- a/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss
+++ b/src/skins/vector/css/matrix-react-sdk/views/messages/_MEmoteBody.scss
@@ -14,6 +14,10 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */

+.mx_MEmoteBody {
+    white-space: pre-wrap;
+}
+
 .mx_MEmoteBody_sender {
    cursor: pointer;
 }