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 /docs/index.html | |
| 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 'docs/index.html')
| -rw-r--r-- | docs/index.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/index.html b/docs/index.html index c61039954..57d5cd6e8 100644 --- a/docs/index.html +++ b/docs/index.html @@ -77,7 +77,7 @@ <ul class="masthead-links"> <li><a href="http://github.com/twitter/bootstrap" >GitHub project</a></li> <li><a href="./extend.html" >Extend</a></li> - <li>Version 2.1.1</li> + <li>Version 2.1.2</li> </ul> </div> </div> |