Merge remote-tracking branch 'mike/master' into dev

2018-06-25 23:49:11 +02:00
parent bb786b1f61 66fc12c928
commit cef1c09db6
3 changed files with 18 additions and 17 deletions
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -297,7 +297,6 @@ code {
 	font-size: 1em;
 	padding: 1em 1.5em;
 	display: block;
-	white-space: pre-wrap;
 }

 code.inline-code {