mirror of https://github.com/glitch-soc/mastodon
![]() Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict because one of the removed lines was modified to accomodate for glitch-soc's slightly different build system. Removed the lines as upstream did. |
||
---|---|---|
.. | ||
confirmations | ||
otp_authentication | ||
recovery_codes | ||
webauthn_credentials |