diff options
| author | Mark Otto <otto@github.com> | 2012-11-30 12:13:30 +0400 |
|---|---|---|
| committer | Mark Otto <otto@github.com> | 2012-11-30 12:13:30 +0400 |
| commit | fca35c0dba060da14ccb29fc56dc37aa1de533c4 (patch) | |
| tree | 04cc972e705bedb2910247bdcfb0c8ede3cee09a /docs/templates/layout.mustache | |
| parent | 7e56e2265d67ae81ad8be52af4d56f189929207a (diff) | |
| parent | bca3ff4ed6f42701ceae1405f518c35ec8c623be (diff) | |
Merge branch '2.2.2-wip' into exploratory
Conflicts:
docs/assets/css/bootstrap.css
docs/components.html
docs/templates/pages/components.mustache
less/alerts.less
less/button-groups.less
less/buttons.less
less/tests/css-tests.html
Diffstat (limited to 'docs/templates/layout.mustache')
| -rw-r--r-- | docs/templates/layout.mustache | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/docs/templates/layout.mustache b/docs/templates/layout.mustache index 2ed7cfe1fd..ae6e441970 100644 --- a/docs/templates/layout.mustache +++ b/docs/templates/layout.mustache @@ -106,7 +106,6 @@ <!-- Placed at the end of the document so the pages load faster --> <script type="text/javascript" src="http://platform.twitter.com/widgets.js"></script> <script src="assets/js/jquery.js"></script> - <script src="assets/js/google-code-prettify/prettify.js"></script> <script src="assets/js/bootstrap-transition.js"></script> <script src="assets/js/bootstrap-alert.js"></script> <script src="assets/js/bootstrap-modal.js"></script> @@ -120,6 +119,10 @@ <script src="assets/js/bootstrap-carousel.js"></script> <script src="assets/js/bootstrap-typeahead.js"></script> <script src="assets/js/bootstrap-affix.js"></script> + + <script src="assets/js/holder/holder.js"></script> + <script src="assets/js/google-code-prettify/prettify.js"></script> + <script src="assets/js/application.js"></script> |