]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 19 Jul 2019 21:37:41 +0000 (23:37 +0200)
commit055450bc02732f654317096f56b03b77f5b84270
tree1b3dd84f1bdc3bfd1ce95a2b0552819ced3e159e
parent86d446194823a416a99c5b4657f4684fb0e07ae9
parentc37c1da41e1c490771a409ad1b12f3db55af4cee
Merge branch 'master' into glitch-soc/merge-upstream
app/controllers/settings/two_factor_authentication/confirmations_controller.rb
app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb