diff options
| author | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
|---|---|---|
| committer | David Baughman <[email protected]> | 2015-08-27 13:41:24 -0700 |
| commit | e481c8fff268a1cce1fe0d60dc85d4f6b85e855e (patch) | |
| tree | 361d07f1cbe685332826d6cb6b291243a939df30 /Gemfile.lock | |
| parent | 026682bf0dc828d8d689cb01e623eb311de0c013 (diff) | |
| parent | 232469549c9a9b6082b311f568556d99ea03af2f (diff) | |
| download | bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.tar.xz bootstrap-e481c8fff268a1cce1fe0d60dc85d4f6b85e855e.zip | |
Merge branch 'v4-dev' into v4-media-breakpoint-between
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 54 |
1 files changed, 27 insertions, 27 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 63b3f42c7..5ab2447cb 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -4,18 +4,18 @@ GEM blankslate (2.1.2.4) celluloid (0.16.0) timers (~> 4.0.0) - classifier-reborn (2.0.2) + classifier-reborn (2.0.3) fast-stemmer (~> 1.0) - coffee-script (2.3.0) + coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.8.0) + coffee-script-source (1.9.1.1) colorator (0.1) - execjs (2.2.2) + execjs (2.6.0) fast-stemmer (1.0.2) - ffi (1.9.6) + ffi (1.9.10) hitimes (1.2.2) - jekyll (2.5.2) + jekyll (2.5.3) classifier-reborn (~> 2.0) colorator (~> 0.1) jekyll-coffeescript (~> 1.0) @@ -32,53 +32,53 @@ GEM toml (~> 0.1.0) jekyll-coffeescript (1.0.1) coffee-script (~> 2.2) - jekyll-gist (1.1.0) + jekyll-gist (1.3.3) jekyll-paginate (1.1.0) jekyll-redirect-from (0.8.0) jekyll (>= 2.0) jekyll-sass-converter (1.3.0) sass (~> 3.2) - jekyll-watch (1.2.0) + jekyll-watch (1.2.1) listen (~> 2.7) - kramdown (1.5.0) - liquid (2.6.1) - listen (2.8.4) - celluloid (>= 0.15.2) + kramdown (1.8.0) + liquid (2.6.3) + listen (2.10.1) + celluloid (~> 0.16.0) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) mercenary (0.3.5) parslet (1.5.0) blankslate (~> 2.0) - posix-spawn (0.3.9) - pygments.rb (0.6.0) + posix-spawn (0.3.11) + pygments.rb (0.6.3) posix-spawn (~> 0.3.6) - yajl-ruby (~> 1.1.0) + yajl-ruby (~> 1.2.0) rainbow (2.0.0) - rb-fsevent (0.9.4) + rb-fsevent (0.9.5) rb-inotify (0.9.5) ffi (>= 0.5.0) - redcarpet (3.2.2) - rouge (1.7.4) + redcarpet (3.3.2) + rouge (1.9.1) safe_yaml (1.0.4) - sass (3.4.9) - scss-lint (0.31.0) + sass (3.4.18) + scss_lint (0.41.0) rainbow (~> 2.0) - sass (~> 3.4.1) + sass (~> 3.4.15) timers (4.0.1) hitimes toml (0.1.2) parslet (~> 1.5.0) - yajl-ruby (1.1.0) + yajl-ruby (1.2.1) PLATFORMS ruby DEPENDENCIES - jekyll (~> 2.5.2) + jekyll (~> 2.5.3) jekyll-redirect-from (~> 0.8.0) - rouge (~> 1.7.4) - sass (~> 3.4.9) - scss-lint (~> 0.31) + rouge (~> 1.9.1) + sass (~> 3.4.18) + scss_lint (~> 0.41) BUNDLED WITH - 1.10.5 + 1.10.6 |