diff options
| author | fat <[email protected]> | 2012-10-29 21:28:17 -0700 |
|---|---|---|
| committer | fat <[email protected]> | 2012-10-29 21:28:17 -0700 |
| commit | 31c1eba51bf3f5a988e7bef9da88372e673c30c2 (patch) | |
| tree | f36c63804b743cf55e2f61ba55827e16c4ae8597 /less | |
| parent | 92e7f166e7b65259cffcf20a27984bc365dd8b48 (diff) | |
| parent | 41ad16fe406956cc8604b295ae0b5f185386c595 (diff) | |
| download | bootstrap-31c1eba51bf3f5a988e7bef9da88372e673c30c2.tar.xz bootstrap-31c1eba51bf3f5a988e7bef9da88372e673c30c2.zip | |
Merge branch '2.1.2-wip' of github.com:twitter/bootstrap into 2.1.2-wip
Conflicts:
bootstrap/css/bootstrap.css
bootstrap/css/bootstrap.min.css
Diffstat (limited to 'less')
| -rw-r--r-- | less/bootstrap.less | 2 | ||||
| -rw-r--r-- | less/responsive.less | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index a09708173..e9d478d0a 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.2 + * Bootstrap v2.2.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 diff --git a/less/responsive.less b/less/responsive.less index e56042e4e..b7f72f41d 100644 --- a/less/responsive.less +++ b/less/responsive.less @@ -1,5 +1,5 @@ /*! - * Bootstrap Responsive v2.1.2 + * Bootstrap Responsive v2.2.0 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 |