Skip to content

Commit

Permalink
Merge branch 'master' into dry-rb
Browse files Browse the repository at this point in the history
  • Loading branch information
acmetech committed Nov 11, 2019
2 parents d9159e0 + 8e105e2 commit 699287a
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions Gemfile.lock
Expand Up @@ -78,7 +78,7 @@ GEM
public_suffix (>= 2.0.2, < 5.0)
arel (9.0.0)
ast (2.4.0)
autoprefixer-rails (9.7.0)
autoprefixer-rails (9.7.1)
execjs
bcrypt (3.1.13)
bcrypt-ruby (3.1.5)
Expand Down Expand Up @@ -191,7 +191,7 @@ GEM
railties (>= 4.2.0)
faraday (0.17.0)
multipart-post (>= 1.2, < 3)
ffi (1.11.1)
ffi (1.11.2)
globalid (0.4.2)
activesupport (>= 4.2.0)
hashie (3.6.0)
Expand All @@ -214,7 +214,7 @@ GEM
sparkr (>= 0.2.0)
term-ansicolor
yard (~> 0.9.12)
jaro_winkler (1.5.3)
jaro_winkler (1.5.4)
jquery-rails (4.3.5)
rails-dom-testing (>= 1, < 3)
railties (>= 4.2.0)
Expand All @@ -234,12 +234,12 @@ GEM
mimemagic (0.3.3)
mini_mime (1.0.2)
mini_portile2 (2.4.0)
minitest (5.12.2)
minitest (5.13.0)
multi_json (1.14.1)
multi_xml (0.6.0)
multipart-post (2.1.1)
nio4r (2.5.2)
nokogiri (1.10.4)
nokogiri (1.10.5)
mini_portile2 (~> 2.4.0)
oauth (0.5.4)
oauth2 (1.4.2)
Expand Down Expand Up @@ -417,7 +417,7 @@ GEM
thor (0.20.3)
thread_safe (0.3.6)
tilt (2.0.10)
tins (1.21.1)
tins (1.22.0)
tzinfo (1.2.5)
thread_safe (~> 0.1)
uglifier (4.2.0)
Expand Down

0 comments on commit 699287a

Please sign in to comment.