about summary refs log tree commit diff
path: root/app/controllers/settings/two_factor_authentication_methods_controller.rb
diff options
context:
space:
mode:
authorThibaut Girka <thib@sitedethib.com>2020-08-19 19:16:41 +0200
committerThibaut Girka <thib@sitedethib.com>2020-08-19 19:16:41 +0200
commit74a9affdcc4293027bb5a42407dd05c8a8a6961f (patch)
treed87b9fee2b074132128942c1b9e77530e1b068c2 /app/controllers/settings/two_factor_authentication_methods_controller.rb
parent5dcc406abee23ff8a5a88b5646550ea266e3bf49 (diff)
parentf6a82cb2cd7d82bc571866de0dcf90f7fdc29ca2 (diff)
Merge branch 'master' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/settings/two_factor_authentication_methods_controller.rb')
0 files changed, 0 insertions, 0 deletions