mirror of https://github.com/Siphonay/mastodon
dfe851b476
Conflicts: - `app/helpers/application_helper.rb`: Upstream added a helper where glitch-soc had its own, not really a conflict. Added upstream's helper. |
||
---|---|---|
.. | ||
confirmations | ||
otp_authentication | ||
recovery_codes | ||
webauthn_credentials |