diff options
| author | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-03-07 01:30:28 -0800 |
| commit | 0143e38a672335b7ca2d73d0de5b2a2b4618f9e9 (patch) | |
| tree | 7188809b7c2194fc0aca9a65b7d07725ee4206d5 /docs/_includes/nav-javascript.html | |
| parent | 642fd5100293755a6003448d4a481f3b314edf15 (diff) | |
| parent | 1f148427de6d35a06e225deeee0b162b11955232 (diff) | |
| download | bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.tar.xz bootstrap-0143e38a672335b7ca2d73d0de5b2a2b4618f9e9.zip | |
Merge branch 'master' into document_popover_focus
Conflicts:
docs/assets/js/docs.min.js
Diffstat (limited to 'docs/_includes/nav-javascript.html')
| -rw-r--r-- | docs/_includes/nav-javascript.html | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/_includes/nav-javascript.html b/docs/_includes/nav-javascript.html index aeeafe264..741b9cf81 100644 --- a/docs/_includes/nav-javascript.html +++ b/docs/_includes/nav-javascript.html @@ -14,6 +14,7 @@ <ul class="nav"> <li><a href="#modals-examples">Examples</a></li> <li><a href="#modals-sizes">Sizes</a></li> + <li><a href="#modals-remove-animation">Remove animation</a></li> <li><a href="#modals-usage">Usage</a></li> </ul> </li> |