Merge remote-tracking branch 'snide/master' into move-javascript-to-bottom

Conflicts:
	sphinx_rtd_theme/layout.html
This commit is contained in:
Eric Hough 2014-01-05 15:11:34 -05:00
commit c9863009c1

View File

@ -70,7 +70,7 @@
{%- block extrahead %} {% endblock %}
{# Keep modernizr in head - http://modernizr.com/docs/#installing #}
<script src="//cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
<script src="http://cdnjs.cloudflare.com/ajax/libs/modernizr/2.6.2/modernizr.min.js"></script>
</head>
@ -143,4 +143,4 @@
{% endif %}
</body>
</html>
</html>