aboutsummaryrefslogtreecommitdiff
path: root/bower.json
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-06-14 20:31:43 -0700
committerMark Otto <[email protected]>2017-06-14 20:31:43 -0700
commitd7302c221aa5688edb6323d754a4b7dd508759e3 (patch)
tree491ceb2b48aee35391da626170eff9d8544d51bb /bower.json
parentc2b68104b65531db02e1f56ef51199ad34f671f3 (diff)
parent658fbd5c96244a28c225bd6e5e64f2c8c0409327 (diff)
downloadbootstrap-d7302c221aa5688edb6323d754a4b7dd508759e3.tar.xz
bootstrap-d7302c221aa5688edb6323d754a4b7dd508759e3.zip
Merge branch 'form-tweaks' of https://github.com/twbs/bootstrap into form-tweaks
Diffstat (limited to 'bower.json')
-rw-r--r--bower.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/bower.json b/bower.json
index befdde18f..257eb184b 100644
--- a/bower.json
+++ b/bower.json
@@ -32,6 +32,6 @@
],
"dependencies": {
"jquery": ">=1.9.1",
- "popper.js": "^1.9.9"
+ "popper.js": "^1.10.1"
}
}