about summary refs log tree commit diff
path: root/app/controllers/settings/two_factor_authentication/confirmations_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-07-07 15:34:00 +0200
committerThibaut Girka <thib@sitedethib.com>2020-07-07 15:58:45 +0200
commite9ad99bc93b6f65277956d997792ec40f08165cb (patch)
treece71714d2d0d680adecf070cb4e698f3a6984b56 /app/controllers/settings/two_factor_authentication/confirmations_controller.rb
parent94e09d309cb068ea92919767e40e655260ac43cb (diff)
parent6e25574ce599cbc37b7215ded03c7d07208af6bb (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- `package.json`:
  Not really a conflict, just some glitch-soc-specific dependency
  too close to an upstream-updated one.
Diffstat (limited to 'app/controllers/settings/two_factor_authentication/confirmations_controller.rb')
0 files changed, 0 insertions, 0 deletions