Skip to content

Commit b62f5f4

Browse files
committed
Merge branch 'release/v.2.3.1'
2 parents 0c144bb + 96e093c commit b62f5f4

1 file changed

Lines changed: 15 additions & 13 deletions

File tree

Gemfile.lock

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,12 @@ GEM
22
remote: https://rubygems.org/
33
specs:
44
RedCloth (4.2.9)
5-
activesupport (4.0.4)
5+
activesupport (4.1.0)
66
i18n (~> 0.6, >= 0.6.9)
7-
minitest (~> 4.2)
8-
multi_json (~> 1.3)
7+
json (~> 1.7, >= 1.7.7)
8+
minitest (~> 5.1)
99
thread_safe (~> 0.1)
10-
tzinfo (~> 0.3.37)
11-
atomic (1.1.16)
10+
tzinfo (~> 1.1)
1211
blankslate (2.1.2.4)
1312
classifier (1.3.4)
1413
fast-stemmer (>= 1.0.0)
@@ -18,11 +17,12 @@ GEM
1817
fast-stemmer (1.0.2)
1918
ffi (1.9.3)
2019
gemoji (1.5.0)
21-
github-pages (17)
20+
github-pages (18)
2221
RedCloth (= 4.2.9)
2322
jekyll (= 1.5.1)
2423
jekyll-mentions (= 0.0.6)
2524
jekyll-redirect-from (= 0.3.1)
25+
jekyll-sitemap (= 0.2.0)
2626
jemoji (= 0.1.0)
2727
kramdown (= 1.3.1)
2828
liquid (= 2.5.5)
@@ -50,10 +50,13 @@ GEM
5050
jekyll (~> 1.4)
5151
jekyll-redirect-from (0.3.1)
5252
jekyll (~> 1.4)
53+
jekyll-sitemap (0.2.0)
54+
jekyll (~> 1.4)
5355
jemoji (0.1.0)
5456
gemoji (~> 1.5.0)
5557
html-pipeline (~> 1.5.0)
5658
jekyll (~> 1.4)
59+
json (1.8.1)
5760
kramdown (1.3.1)
5861
liquid (2.5.5)
5962
listen (1.3.1)
@@ -62,8 +65,7 @@ GEM
6265
rb-kqueue (>= 0.2)
6366
maruku (0.7.0)
6467
mini_portile (0.5.3)
65-
minitest (4.7.5)
66-
multi_json (1.9.2)
68+
minitest (5.3.3)
6769
nokogiri (1.6.1)
6870
mini_portile (~> 0.5.0)
6971
parslet (1.5.0)
@@ -73,18 +75,18 @@ GEM
7375
posix-spawn (~> 0.3.6)
7476
yajl-ruby (~> 1.1.0)
7577
rb-fsevent (0.9.4)
76-
rb-inotify (0.9.3)
78+
rb-inotify (0.9.4)
7779
ffi (>= 0.5.0)
7880
rb-kqueue (0.2.2)
7981
ffi (>= 0.5.0)
8082
rdiscount (2.1.7)
8183
redcarpet (2.3.0)
82-
safe_yaml (1.0.1)
83-
thread_safe (0.3.1)
84-
atomic (>= 1.1.7, < 2)
84+
safe_yaml (1.0.3)
85+
thread_safe (0.3.3)
8586
toml (0.1.1)
8687
parslet (~> 1.5.0)
87-
tzinfo (0.3.39)
88+
tzinfo (1.1.0)
89+
thread_safe (~> 0.1)
8890
yajl-ruby (1.1.0)
8991

9092
PLATFORMS

0 commit comments

Comments
 (0)