diff options
author | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
---|---|---|
committer | David Yip <yipdw@member.fsf.org> | 2018-03-19 15:41:59 -0500 |
commit | 0fa0836e63674104cea5095c5336bab8587d8634 (patch) | |
tree | bcafd10ffe52f32b95c470c59bdb83309a0f6ce9 /Gemfile.lock | |
parent | c074b226b68d81b0503f935dc81b74cd11b11d67 (diff) | |
parent | df70571bfe8aa18cfb44661fb02cc1e2e256c4e8 (diff) |
Merge remote-tracking branch 'personal/merge/tootsuite/master' into gs-master
Diffstat (limited to 'Gemfile.lock')
-rw-r--r-- | Gemfile.lock | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 693773d36..4ae407f79 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -141,7 +141,7 @@ GEM devise (~> 4.0) railties (< 5.2) rotp (~> 2.0) - devise_pam_authenticatable2 (8.0.1) + devise_pam_authenticatable2 (9.0.0) devise (>= 4.0.0) rpam2 (~> 3.0) diff-lcs (1.3) @@ -634,7 +634,7 @@ DEPENDENCIES climate_control (~> 0.2) devise (~> 4.4) devise-two-factor (~> 3.0) - devise_pam_authenticatable2 (~> 8.0) + devise_pam_authenticatable2 (~> 9.0) doorkeeper (~> 4.2) dotenv-rails (~> 2.2) fabrication (~> 2.18) |