Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/pull/2802'
Browse files Browse the repository at this point in the history
  • Loading branch information
tomhughes committed Aug 31, 2020
2 parents 796fde8 + 8e17c53 commit 61c3d97
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ GEM
railties (>= 4.2.0)
thor (>= 0.14, < 2.0)
json (2.3.1)
jwt (2.2.1)
jwt (2.2.2)
kgio (2.11.3)
kramdown (2.3.0)
rexml
Expand Down Expand Up @@ -300,7 +300,7 @@ GEM
omniauth (1.9.1)
hashie (>= 3.4.6)
rack (>= 1.6.2, < 3)
omniauth-facebook (6.0.0)
omniauth-facebook (7.0.0)
omniauth-oauth2 (~> 1.2)
omniauth-github (1.4.0)
omniauth (~> 1.5)
Expand All @@ -315,8 +315,8 @@ GEM
omniauth-oauth (1.1.0)
oauth
omniauth (~> 1.0)
omniauth-oauth2 (1.6.0)
oauth2 (~> 1.1)
omniauth-oauth2 (1.7.0)
oauth2 (~> 1.4)
omniauth (~> 1.9)
omniauth-openid (1.0.1)
omniauth (~> 1.0)
Expand Down

0 comments on commit 61c3d97

Please sign in to comment.