aboutsummaryrefslogtreecommitdiff
path: root/Gemfile.lock
diff options
context:
space:
mode:
authorPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
committerPierre-Denis Vanduynslager <[email protected]>2017-03-18 22:08:55 -0400
commitf5cc59145642d78d7abbdf38fee1905786da5367 (patch)
tree94e9454a55f9a55353a0ade4bebb7935d03e7da1 /Gemfile.lock
parent4ab576a41941b720e2f6fa77724203f66a1d3a17 (diff)
parent192a8af0dfcdb5d64a5f273b804011bdcd5d2436 (diff)
downloadbootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.tar.xz
bootstrap-f5cc59145642d78d7abbdf38fee1905786da5367.zip
Merge branch 'twbs/v4-dev' into dropdown-keyboard
Diffstat (limited to 'Gemfile.lock')
-rw-r--r--Gemfile.lock22
1 files changed, 11 insertions, 11 deletions
diff --git a/Gemfile.lock b/Gemfile.lock
index c245b6aa8..e4c66f6cf 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -4,9 +4,9 @@ GEM
addressable (2.5.0)
public_suffix (~> 2.0, >= 2.0.2)
colorator (1.1.0)
- ffi (1.9.14)
+ ffi (1.9.17)
forwardable-extended (2.6.0)
- jekyll (3.3.1)
+ jekyll (3.4.0)
addressable (~> 2.4)
colorator (~> 1.0)
jekyll-sass-converter (~> 1.0)
@@ -17,15 +17,15 @@ GEM
pathutil (~> 0.9)
rouge (~> 1.7)
safe_yaml (~> 1.0)
- jekyll-redirect-from (0.12.0)
+ jekyll-redirect-from (0.12.1)
jekyll (~> 3.3)
jekyll-sass-converter (1.5.0)
sass (~> 3.4)
- jekyll-sitemap (0.12.0)
+ jekyll-sitemap (1.0.0)
jekyll (~> 3.3)
jekyll-watch (1.5.0)
listen (~> 3.0, < 3.1)
- kramdown (1.13.1)
+ kramdown (1.13.2)
liquid (3.0.6)
listen (3.0.8)
rb-fsevent (~> 0.9, >= 0.9.4)
@@ -36,12 +36,12 @@ GEM
public_suffix (2.0.5)
rake (12.0.0)
rb-fsevent (0.9.8)
- rb-inotify (0.9.7)
+ rb-inotify (0.9.8)
ffi (>= 0.5.0)
rouge (1.11.1)
safe_yaml (1.0.4)
sass (3.4.23)
- scss_lint (0.51.0)
+ scss_lint (0.52.0)
rake (>= 0.9, < 13)
sass (~> 3.4.20)
@@ -49,10 +49,10 @@ PLATFORMS
ruby
DEPENDENCIES
- jekyll (~> 3.3.1)
- jekyll-redirect-from (~> 0.12.0)
- jekyll-sitemap (~> 0.12.0)
- scss_lint (~> 0.51.0)
+ jekyll (~> 3.4.0)
+ jekyll-redirect-from (~> 0.12.1)
+ jekyll-sitemap (~> 1.0.0)
+ scss_lint (~> 0.52.0)
BUNDLED WITH
1.13.6