diff options
| author | Mark Otto <[email protected]> | 2012-09-07 22:34:51 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-09-07 22:34:51 -0700 |
| commit | 7e2958121028b4fdfcd40f7d03dd3c37ceba6a51 (patch) | |
| tree | a357929a7f065cfd2ad2498412e224eb2d0df458 /less/bootstrap.less | |
| parent | cb46ddee72eb45f835504a625947c821c8f60635 (diff) | |
| parent | f29f98501c11678e2ecfe8fd5c842adcd5a40091 (diff) | |
| download | bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.tar.xz bootstrap-7e2958121028b4fdfcd40f7d03dd3c37ceba6a51.zip | |
Merge branch '2.1.2-wip' into box-sizing-exercise
Conflicts:
docs/scaffolding.html
docs/templates/pages/scaffolding.mustache
Diffstat (limited to 'less/bootstrap.less')
| -rw-r--r-- | less/bootstrap.less | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/less/bootstrap.less b/less/bootstrap.less index aaa3d8a6f..3055c5cc4 100644 --- a/less/bootstrap.less +++ b/less/bootstrap.less @@ -1,5 +1,5 @@ /*! - * Bootstrap v2.1.1 + * Bootstrap v2.1.2 * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 |