diff options
| author | Jacob Thornton <[email protected]> | 2012-01-24 14:33:52 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2012-01-24 14:33:52 -0800 |
| commit | 5f209ed810b17fa88ad9683d1888f14965b19f9e (patch) | |
| tree | 193a14f9c9d61f0e5eee5dd5ebd192758570fdb8 /bootstrap.css | |
| parent | fbc1ab14cc7e591f4b2e53ef3fb25ef7dc243fce (diff) | |
| parent | 58f7fd308a5c4511cf9a10a12c89d550c469b3f1 (diff) | |
| download | bootstrap-5f209ed810b17fa88ad9683d1888f14965b19f9e.tar.xz bootstrap-5f209ed810b17fa88ad9683d1888f14965b19f9e.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
docs/templates/pages/index.mustache
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 71d942401..fb3a3f2ab 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: Tue Jan 24 12:27:30 PST 2012 + * Date: Tue Jan 24 13:58:10 PST 2012 */ article, aside, |