diff options
| author | Jacob Thornton <[email protected]> | 2011-09-16 11:24:07 -0700 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-09-16 11:24:07 -0700 |
| commit | c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee (patch) | |
| tree | 75c97593b25066d9c2d7bd76eef24e23d1f106d3 /lib | |
| parent | aa432390888bae158bbc3014eed9af55103d03aa (diff) | |
| parent | 427a001c476569684027567e5a7cec89058185ad (diff) | |
| download | bootstrap-c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee.tar.xz bootstrap-c7c5ce8dcd4cc6c56bc64007bf31b93760dbf2ee.zip | |
Merge branch 'master' of github.com:twitter/bootstrap into 1.3-wip
Conflicts:
Makefile
README.md
bootstrap.css
bootstrap.min.css
lib/bootstrap.less
lib/scaffolding.less
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bootstrap.less | 2 | ||||
| -rw-r--r-- | lib/scaffolding.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/bootstrap.less b/lib/bootstrap.less index 2f9ee80b8..62f2ce916 100644 --- a/lib/bootstrap.less +++ b/lib/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v1.3.0 + * Bootstrap @VERSION * * Copyright 2011 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/lib/scaffolding.less b/lib/scaffolding.less index 13cc4f2b1..aede36e53 100644 --- a/lib/scaffolding.less +++ b/lib/scaffolding.less @@ -134,4 +134,4 @@ a { .span-one-third { width: 300px; } .span-two-thirds { width: 620px; } .offset-one-third { margin-left: 340px; } -.offset-two-thirds { margin-left: 660px; }
\ No newline at end of file +.offset-two-thirds { margin-left: 660px; } |