diff options
| author | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
|---|---|---|
| committer | Jacob Thornton <[email protected]> | 2011-12-22 19:15:09 -0800 |
| commit | 35fdbad24b908714ff1a1221945598527a641863 (patch) | |
| tree | 0a054ac3f3b913fb16f71731b4b04472311afc4a /docs/upgrading.html | |
| parent | 87ac818253a26bcf09fa55f78ae3f55759c54e64 (diff) | |
| parent | 9fb380151d477f1741b7609ade7a9e7fd5450b2c (diff) | |
| download | bootstrap-35fdbad24b908714ff1a1221945598527a641863.tar.xz bootstrap-35fdbad24b908714ff1a1221945598527a641863.zip | |
Merge branch '2.0-wip' of https://github.com/twitter/bootstrap into 2.0-wip
Conflicts:
bootstrap.css
docs/assets/js/application.js
docs/base-css.html
docs/components.html
docs/index.html
docs/javascript.html
docs/less.html
docs/scaffolding.html
docs/upgrading.html
Diffstat (limited to 'docs/upgrading.html')
| -rw-r--r-- | docs/upgrading.html | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/docs/upgrading.html b/docs/upgrading.html index 4dedb37d8..7be1fd708 100644 --- a/docs/upgrading.html +++ b/docs/upgrading.html @@ -38,7 +38,7 @@ <li><a href="./base-css.html">Base CSS</a></li> <li><a href="./components.html">Components</a></li> <li><a href="./javascript.html">Javascript plugins</a></li> - <li class="active"><a href="./less.html">Using LESS</a></li> + <li><a href="./less.html">Using LESS</a></li> </ul> </div> </div> @@ -100,6 +100,16 @@ </ul> </li> </ul> +<!-- + <li> + <ul> + <li></li> + </ul> + </li> +--> +</ul> + + <!-- Footer ================================================== --> <footer class="footer"> @@ -109,5 +119,6 @@ <p>Icons from <a href="http://glyphicons.com">Glyphicons Free</a>, licensed under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> </footer> </div><!-- /container --> + </body> </html> |