diff options
| author | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
|---|---|---|
| committer | David Yip <yipdw@member.fsf.org> | 2018-04-12 03:30:57 -0500 |
| commit | a817f084eafaf5527445c29ab1d68f42b1a2872f (patch) | |
| tree | f146e6c8ff958d60804e33e40e1970784f5b7b90 /Gemfile.lock | |
| parent | eb72c3398cd70c6b595fae5a0cb6730a3e49bd61 (diff) | |
| parent | 8e88a18316d45a459a31d67487bccc247592d187 (diff) | |
Merge remote-tracking branch 'tootsuite/master'
Conflicts: app/controllers/statuses_controller.rb
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index c92b40d6c..c81249411 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -146,9 +146,9 @@ GEM devise (~> 4.0) railties (< 5.2) rotp (~> 2.0) - devise_pam_authenticatable2 (9.0.0) + devise_pam_authenticatable2 (9.1.0) devise (>= 4.0.0) - rpam2 (~> 3.0) + rpam2 (~> 4.0) diff-lcs (1.3) docile (1.1.5) domain_name (0.5.20170404) @@ -467,7 +467,7 @@ GEM actionpack (>= 4.2.0, < 5.3) railties (>= 4.2.0, < 5.3) rotp (2.1.2) - rpam2 (3.1.0) + rpam2 (4.0.2) rqrcode (0.10.1) chunky_png (~> 1.0) rspec-core (3.7.0) @@ -642,7 +642,7 @@ DEPENDENCIES climate_control (~> 0.2) devise (~> 4.4) devise-two-factor (~> 3.0) - devise_pam_authenticatable2 (~> 9.0) + devise_pam_authenticatable2 (~> 9.1) doorkeeper (~> 4.2) dotenv-rails (~> 2.2) fabrication (~> 2.18) |