Merge branch '3.1.x' into 3.2.x

This commit is contained in:
Marc Alexander 2016-12-18 16:22:59 +01:00
commit 909aef0ed3
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -514,7 +514,7 @@ blockquote .codebox {
height: auto; height: auto;
max-height: 200px; max-height: 200px;
padding-top: 5px; padding-top: 5px;
font: 0.9em Monaco, "Andale Mono","Courier New", Courier, mono; font: 0.9em Monaco, "Andale Mono","Courier New", Courier, monospace;
line-height: 1.3em; line-height: 1.3em;
margin: 2px 0; margin: 2px 0;
} }