diff options
| author | Mark Otto <[email protected]> | 2015-06-18 23:56:43 -0700 |
|---|---|---|
| committer | Mark Otto <[email protected]> | 2015-06-18 23:56:43 -0700 |
| commit | 169d2a4a78776ddaa4fec774691a3c5f03aa3eda (patch) | |
| tree | 997248da2a627a3ef3478dd0f8f8077267c56e22 /docs/_includes | |
| parent | df2ca92d7704d54a15be54e5da8086712bd18680 (diff) | |
| parent | 1e64692716985246f70c89bcf8d5119e17a353c0 (diff) | |
| download | bootstrap-169d2a4a78776ddaa4fec774691a3c5f03aa3eda.tar.xz bootstrap-169d2a4a78776ddaa4fec774691a3c5f03aa3eda.zip | |
Merge branch 'master' into v4
Diffstat (limited to 'docs/_includes')
| -rw-r--r-- | docs/_includes/footer.html | 2 | ||||
| -rw-r--r-- | docs/_includes/social-buttons.html | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/_includes/footer.html b/docs/_includes/footer.html index 7b4b8d2d1..f1b8db66a 100644 --- a/docs/_includes/footer.html +++ b/docs/_includes/footer.html @@ -35,7 +35,7 @@ <!-- Bootstrap core JavaScript ================================================== --> <!-- Placed at the end of the document so the pages load faster --> -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script> +<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.3/jquery.min.js"></script> {% if site.github %} <script src="{{ site.baseurl }}/dist/js/bootstrap.min.js"></script> diff --git a/docs/_includes/social-buttons.html b/docs/_includes/social-buttons.html index c20fcaa9e..f7a3329b3 100644 --- a/docs/_includes/social-buttons.html +++ b/docs/_includes/social-buttons.html @@ -1,10 +1,10 @@ <div class="bd-social"> <ul class="bd-social-buttons"> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" width="100" height="20" title="Star on GitHub"></iframe> + <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=watch&count=true" width="100" height="20" title="Star on GitHub"></iframe> </li> <li> - <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" width="102" height="20" title="Fork on GitHub"></iframe> + <iframe class="github-btn" src="https://ghbtns.com/github-btn.html?user=twbs&repo=bootstrap&type=fork&count=true" width="102" height="20" title="Fork on GitHub"></iframe> </li> <li class="follow-btn"> <a href="https://twitter.com/getbootstrap" class="twitter-follow-button" data-link-color="#0069D6" data-show-count="true">Follow @getbootstrap</a> |