diff options
| author | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2012-11-22 22:04:21 -0800 |
| commit | 7e56e2265d67ae81ad8be52af4d56f189929207a (patch) | |
| tree | 8bede49f32e25f4acfe95a2a7cc86bd273805474 /docs/base-css.html | |
| parent | fa1c130552022520161a2b0c595e2ca431df0c97 (diff) | |
| parent | e0d0190803398ce12b2fe88e31e45993b35cf17e (diff) | |
| download | bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.tar.xz bootstrap-7e56e2265d67ae81ad8be52af4d56f189929207a.zip | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
less/button-groups.less
Diffstat (limited to 'docs/base-css.html')
| -rw-r--r-- | docs/base-css.html | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/docs/base-css.html b/docs/base-css.html index 6a1698aec..1cebfadf0 100644 --- a/docs/base-css.html +++ b/docs/base-css.html @@ -2155,7 +2155,6 @@ For example, <code><section></code> should be wrapped as inlin ================================================== --> <footer class="footer"> <div class="container"> - <p class="pull-right"><a href="#">Back to top</a></p> <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p> <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p> <p><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> |