diff options
| author | Mark Otto <[email protected]> | 2012-01-27 21:09:24 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-01-27 21:09:24 -0800 |
| commit | d0447e9aa54898ea46596e0e2077f33f0dbd1968 (patch) | |
| tree | 87f246db49b2130b5c7cc76ddde95f289f73cc00 /docs/assets/css | |
| parent | 3934d1b6c4cb975967235547b77e90b4c8c91be2 (diff) | |
| parent | 15d3a4797f3435d1531804369df87fa4e574b874 (diff) | |
| download | bootstrap-d0447e9aa54898ea46596e0e2077f33f0dbd1968.tar.xz bootstrap-d0447e9aa54898ea46596e0e2077f33f0dbd1968.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/css')
| -rw-r--r-- | docs/assets/css/bootstrap-responsive.css | 2 | ||||
| -rw-r--r-- | docs/assets/css/bootstrap.css | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/docs/assets/css/bootstrap-responsive.css b/docs/assets/css/bootstrap-responsive.css index 8b1d98b5c..acebb64d3 100644 --- a/docs/assets/css/bootstrap-responsive.css +++ b/docs/assets/css/bootstrap-responsive.css @@ -273,4 +273,4 @@ .offset12 { .offset(12); } } -*/ +*/
\ No newline at end of file diff --git a/docs/assets/css/bootstrap.css b/docs/assets/css/bootstrap.css index 002c937a0..0ad058814 100644 --- a/docs/assets/css/bootstrap.css +++ b/docs/assets/css/bootstrap.css @@ -6,7 +6,6 @@ * 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 21:07:37 PST 2012 */ article, aside, |