aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2016-09-11 21:57:27 -0700
committerMark Otto <[email protected]>2016-09-11 21:57:27 -0700
commite2b04b948ceaa69d443ce31d88b20ac5b9112be2 (patch)
treecd69fa9a8a2f3d93fca12644aae1f8a8a7c96b99
parentcbd2ac0ee7560f87e9547eb6456b142f43fe0116 (diff)
parent5bc2d0e8617b39df1a788cf2d2fa3855956cda48 (diff)
downloadbootstrap-e2b04b948ceaa69d443ce31d88b20ac5b9112be2.tar.xz
bootstrap-e2b04b948ceaa69d443ce31d88b20ac5b9112be2.zip
Merge branch 'v4-dev' of github.com:twbs/bootstrap into v4-dev
-rw-r--r--_config.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/_config.yml b/_config.yml
index 05c576afd..f3283b462 100644
--- a/_config.yml
+++ b/_config.yml
@@ -38,9 +38,9 @@ themes: http://themes.getbootstrap.com
cdn:
# See https://www.srihash.org for info on how to generate the hashes
css: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/css/bootstrap.min.css
- css_hash: "2hfp1SzUoho7/TsGGGDaFdsuuDL0LX2hnUp6VkX3CUQ2K4K+xjboZdsXyp4oUHZj"
+ css_hash: "sha384-2hfp1SzUoho7/TsGGGDaFdsuuDL0LX2hnUp6VkX3CUQ2K4K+xjboZdsXyp4oUHZj"
js: https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0-alpha.4/js/bootstrap.min.js
- js_hash: "VjEeINv9OSwtWFLAtmc4JCtEJXXBub00gtSnszmspDLCtC0I4z4nqz7rEFbIZLLU"
+ js_hash: "sha384-VjEeINv9OSwtWFLAtmc4JCtEJXXBub00gtSnszmspDLCtC0I4z4nqz7rEFbIZLLU"
jquery: https://ajax.googleapis.com/ajax/libs/jquery/3.0.0/jquery.min.js
jquery_hash: "sha384-THPy051/pYDQGanwU6poAc/hOdQxjnOEXzbT+OuUAFqNqFjL+4IGLBgCJC3ZOShY"
tether: https://cdnjs.cloudflare.com/ajax/libs/tether/1.2.0/js/tether.min.js