diff options
| author | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-03 04:17:11 +0000 |
|---|---|---|
| committer | Jenkins <jenkins@jenkins.ninjawedding.org> | 2018-01-03 04:17:11 +0000 |
| commit | 933840bebf4ce8f5282c88e8c3e8c1b3675fbf2d (patch) | |
| tree | e1d156a830d9446218ad1f250111dfc32df76961 /Gemfile.lock | |
| parent | fa768abf5c10eb3469a26347a9fa5ff677b3d394 (diff) | |
| parent | 99f962ba731f67050a914bb5b9a245869531ebd1 (diff) | |
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
Diffstat (limited to 'Gemfile.lock')
| -rw-r--r-- | Gemfile.lock | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Gemfile.lock b/Gemfile.lock index 8af7872af..58c59ad35 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -562,7 +562,7 @@ DEPENDENCIES charlock_holmes (~> 0.7.5) cld3 (~> 3.2.0) climate_control (~> 0.2) - devise (~> 4.2) + devise (~> 4.3) devise-two-factor (~> 3.0) doorkeeper (~> 4.2) dotenv-rails (~> 2.2) |