diff options
| author | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2014-01-11 19:13:10 -0800 |
| commit | bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80 (patch) | |
| tree | dbeab5560ca6760fa65e9f342c517dcbe56475f9 /docs/_includes/footer.html | |
| parent | ea20f44815b535975d1f1416fee15bd1ea7acdb3 (diff) | |
| parent | 80c9c14ab956459f07a7f1de8693a2ab693bcb51 (diff) | |
| download | bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.tar.xz bootstrap-bacfd65cb2f9de9e9b4b3fcc83a3aef73befcb80.zip | |
Merge branch 'master' into docs_derp
Conflicts:
docs/getting-started.html
Diffstat (limited to 'docs/_includes/footer.html')
| -rw-r--r-- | docs/_includes/footer.html | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 6101ed86c..d5f2d472d 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -30,12 +30,8 @@ <!-- Placed at the end of the document so the pages load faster --> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.10.2/jquery.min.js"></script> <script src="{{ site.baseurl }}dist/js/bootstrap.min.js"></script> - -<script src="{{ site.baseurl }}assets/js/holder.js"></script> -<script src="{{ site.baseurl }}assets/js/application.js"></script> - +<script src="{{ site.baseurl }}assets/js/docs.min.js"></script> {% if page.slug == "customize" %} -<script src="{{ site.baseurl }}assets/js/raw-files.js"></script> <script src="{{ site.baseurl }}assets/js/customize.min.js"></script> {% endif %} |
