1
0
mirror of https://github.com/twbs/bootstrap.git synced 2025-09-25 12:59:05 +02:00

Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.min.css
This commit is contained in:
Mark Otto
2013-09-11 12:31:21 -07:00
14 changed files with 41 additions and 51 deletions

View File

@@ -5,7 +5,9 @@
// Inline and block code styles
code,
pre {
kdb,
pre,
samp {
font-family: @font-family-monospace;
}