Merge pull request #3403 from matrix-org/bwindels/cider-italics

New composer: use underscore for italics so it doesn't collide with bold when toggling

src/components/views/rooms/BasicMessageComposer.js

@@ -460,7 +460,7 @@ export default class BasicMessageEditor extends React.Component {
                 toggleInlineFormat(range, "**");
                 break;
             case "italics":
-                toggleInlineFormat(range, "*");
+                toggleInlineFormat(range, "_");
                 break;
             case "strikethrough":
                 toggleInlineFormat(range, "<del>", "</del>");