diff options
| author | Mark Otto <[email protected]> | 2012-01-27 14:49:02 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 14:49:02 -0800 |
| commit | 91e9f6fa91ea2f6d8cc47b8dbf1428847ad6504f (patch) | |
| tree | d4c8432b4cfc318603727726a512a7df24ca3dc9 /docs/assets | |
| parent | 22359f9dfdf5d513da163416005345649415b90f (diff) | |
| parent | 065ed01b1f78a1e5d358b78304ef211d7b96f362 (diff) | |
| download | bootstrap-91e9f6fa91ea2f6d8cc47b8dbf1428847ad6504f.tar.xz bootstrap-91e9f6fa91ea2f6d8cc47b8dbf1428847ad6504f.zip | |
Merge branch '2.0-wip' of github.com:twitter/bootstrap into 2.0-wip
Conflicts:
docs/assets/css/bootstrap.css
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 7765d7961..39ac62f7a 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 14:48:21 PST 2012 + * Date: Fri Jan 27 14:48:53 PST 2012 */ article, aside, |