Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

ece90366 · Dmitriy Zaporozhets · 3220e191 · d0296fc9 · ece90366
Commit ece90366 authored Oct 22, 2014 by Dmitriy Zaporozhets
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

app/assets/stylesheets/main/fonts.scss app/assets/stylesheets/main/fonts.scss +1 -1

No files found.
--- a/app/assets/stylesheets/main/fonts.scss
+++ b/app/assets/stylesheets/main/fonts.scss
 /** Typo **/
-$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'Courier New', 'andale mono', 'lucida console', monospace;
+$monospace_font: 'Menlo', 'Liberation Mono', 'Consolas', 'DejaVu Sans Mono', 'Ubuntu Mono', 'Courier New', 'andale mono', 'lucida console', monospace;
 $regular_font: "Helvetica Neue", Helvetica, Arial, sans-serif;