aboutsummaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorMark Otto <[email protected]>2017-05-30 23:31:40 -0700
committerMark Otto <[email protected]>2017-05-30 23:31:40 -0700
commit2fd192968dadc0f8d1d22a6f48c208aacd79e71f (patch)
treed029a8d11816751496292de096438004b0d82627 /Gemfile.lock
parentf8d1dc4d04fa341c2900de9a2ea01f3ecd8753b2 (diff)
parentccd86bdc967d8714f718c55bd13db967f2e849d2 (diff)
downloadbootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.tar.xz
bootstrap-2fd192968dadc0f8d1d22a6f48c208aacd79e71f.zip
Merge branch 'v4-dev' into v4-docs-streamlined
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock6
1 files changed, 4 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index 71753d9e8..5b894b564 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -5,6 +5,7 @@ GEM
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
ffi (1.9.18)
+ ffi (1.9.18-x64-mingw32)
forwardable-extended (2.6.0)
jekyll (3.4.3)
addressable (~> 2.4)
@@ -45,13 +46,14 @@ GEM
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
- sass (3.4.23)
+ sass (3.4.24)
scss_lint (0.53.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
PLATFORMS
ruby
+ x64-mingw32
DEPENDENCIES
jekyll (~> 3.4.3)
@@ -61,4 +63,4 @@ DEPENDENCIES
scss_lint (~> 0.53.0)
BUNDLED WITH
- 1.14.6
+ 1.15.0