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 /less | |
| 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 'less')
| -rw-r--r-- | less/bootstrap.less | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index bc9f84373..3dad408c9 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,12 +1,11 @@ /*! - * Bootstrap @VERSION + * Bootstrap v2.0.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 * http://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. - * Date: @DATE */ // CSS Reset |