diff options
| author | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-07-09 10:48:58 -0700 |
| commit | 41f3af407bab6c77f61b1d1fc8d3526f5276076f (patch) | |
| tree | cb9a982f2fc56ec1ce71849d37dc06b47d313cf3 /docs/components.html | |
| parent | 0e47ce959ce6257c8fdde13b1362dbbe19fb56e3 (diff) | |
| parent | 87c9ce5333139eede2f02d6812c083a86db61cdf (diff) | |
| download | bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.tar.xz bootstrap-41f3af407bab6c77f61b1d1fc8d3526f5276076f.zip | |
Merge branch 'derp' into derp_navs
Conflicts:
dist/css/bootstrap.css.map
dist/css/bootstrap.min.css
docs/dist/css/bootstrap.css.map
docs/dist/css/bootstrap.min.css
Diffstat (limited to 'docs/components.html')
| -rw-r--r-- | docs/components.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/components.html b/docs/components.html index bf00f8bb5..555a519d5 100644 --- a/docs/components.html +++ b/docs/components.html @@ -2,7 +2,7 @@ layout: default title: Components slug: components -lead: "Over a dozen reusable components built to provide iconography, dropdowns, input groups, navigation, alerts, and much more." +lead: "Over a dozen reusable components built to provide dropdowns, input groups, navigation, alerts, and much more." --- {% include components/dropdowns.html %} |