Claire 26193a119b Merge commit 'd9b70bbde13b78709b48be6c979bc7520e81520a' into glitch-soc/merge-upstream ...

Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper close to a glitch-soc one.
  Added upstream's helper.

2025-09-16 18:30:30 +02:00

..

two_factor

Rely on mail_to helper default name arg value (#35913)

2025-08-27 13:05:13 +00:00

new.html.haml

Fix login page linking to other pages within OAuth authorization flow (#36115)

2025-09-16 14:25:21 +00:00

two_factor.html.haml

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

2025-05-25 14:36:51 +02:00