diff options
| author | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2011-12-09 11:33:02 -0800 |
| commit | 312ee6cdfb20f7602924c90e6ae37cba62a39da4 (patch) | |
| tree | 1931bb96def7cc20931b6f763fcd934abaeddeb8 /bootstrap.css | |
| parent | b12b71bf7ca76437a532122d8efff59506b61530 (diff) | |
| parent | cee2f61898f4807311402fed747a93ee68a31f8f (diff) | |
| download | bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.tar.xz bootstrap-312ee6cdfb20f7602924c90e6ae37cba62a39da4.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 d0c78d037..adae67ec9 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: Fri Dec 9 11:23:25 PST 2011 + * Date: Fri Dec 9 11:32:45 PST 2011 */ html, body { margin: 0; |