diff options
| author | Jacob Thornton <[email protected]> | 2012-01-08 00:50:48 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-08 00:50:48 -0800 |
| commit | bc505560a05cd867ea8dbfbcefe2217223d58316 (patch) | |
| tree | 2a2948c3b8b606cf5707ab7a37199d18b114c435 /bootstrap.css | |
| parent | 4478df768168fe41599508688046612bf5f1e526 (diff) | |
| parent | 3c2f82f469be4792e85eb73fd1e3b882dcadd48d (diff) | |
| download | bootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.tar.xz bootstrap-bc505560a05cd867ea8dbfbcefe2217223d58316.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
bootstrap.min.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 7d6263c6b..a46f6ca85 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: Sat Jan 7 23:50:13 PST 2012 + * Date: Sun Jan 8 00:50:20 PST 2012 */ html, body { margin: 0; |