diff options
| author | Mark Otto <[email protected]> | 2012-01-25 11:27:29 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-25 11:27:29 -0800 |
| commit | e24bd40b4a38b190caad2da9b90c683167c76004 (patch) | |
| tree | c7305cf363c71186eb40173f433306b1ac2fc7a6 /bootstrap.css | |
| parent | b8511568637dfa4decb3f0475436a3dfa637a57d (diff) | |
| parent | 25519bacd56ee2507cdde727d85458e5e5ef7949 (diff) | |
| download | bootstrap-e24bd40b4a38b190caad2da9b90c683167c76004.tar.xz bootstrap-e24bd40b4a38b190caad2da9b90c683167c76004.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
Diffstat (limited to 'bootstrap.css')
| -rw-r--r-- | bootstrap.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bootstrap.css b/bootstrap.css index 39add8696..730167f51 100644 --- a/bootstrap.css +++ b/bootstrap.css @@ -6,7 +6,7 @@ * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: Wed Jan 25 11:24:56 PST 2012 + * Date: Wed Jan 25 11:27:15 PST 2012 */ article, aside, |