diff options
| author | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 13:21:01 -0800 |
| commit | ccd963e622bdcadc8a79f5b8c1bb770b09f63f20 (patch) | |
| tree | 64c97dbd98648791b2eb04682e25dcc6610f5aa4 /docs/assets | |
| parent | e8647c1b118d2c726a8987e9a41aad82da972b57 (diff) | |
| parent | 3b3dbd7229f53eb71759def4eca90dfd7a2699f8 (diff) | |
| download | bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.tar.xz bootstrap-ccd963e622bdcadc8a79f5b8c1bb770b09f63f20.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
docs/download.html
Diffstat (limited to 'docs/assets')
| -rw-r--r-- | docs/assets/css/bootstrap.css | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index b772e8bbb..4f1e18ce9 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/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 Jan 27 13:19:35 PST 2012 + * Date: Fri Jan 27 13:20:51 PST 2012 */ article, aside, |