diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:17:06 +0200 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-07-23 10:51:07 +0200 |
| commit | 444796b69b0cd2c7b4b95d3b3119e0b7a503f682 (patch) | |
| tree | 6607b9d27817f66a1395bcfaea609198015f8973 /.editorconfig | |
| parent | 6db5669818cce459b9bb916665541b7b8f5d5155 (diff) | |
| parent | ab3126e7a23125b033ec198cfd83c2178338442c (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/controllers/application_controller.rb - app/controllers/auth/confirmations_controller.rb - app/controllers/auth/sessions_controller.rb - app/controllers/settings/deletes_controller.rb - app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb
Diffstat (limited to '.editorconfig')
0 files changed, 0 insertions, 0 deletions