tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

Browse Source
This commit is contained in:
Jenkins
2018-03-19 20:17:18 +00:00
parent ab04be2f84 ff6b8a6443
commit df70571bfe
22 changed files with 134 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Gemfile.lock
View File

@ -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)