diff options
| author | ThibG <thib@sitedethib.com> | 2020-08-19 19:36:58 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-08-19 19:36:58 +0200 |
| commit | 83cd512777e1b479b4721f4d0253745949962910 (patch) | |
| tree | d87b9fee2b074132128942c1b9e77530e1b068c2 /app/controllers/settings/two_factor_authentication_methods_controller.rb | |
| parent | 5dcc406abee23ff8a5a88b5646550ea266e3bf49 (diff) | |
| parent | 74a9affdcc4293027bb5a42407dd05c8a8a6961f (diff) | |
Merge pull request #1408 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/controllers/settings/two_factor_authentication_methods_controller.rb')
0 files changed, 0 insertions, 0 deletions