mirror of https://github.com/Siphonay/mastodon
b368c75029
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did. |
||
---|---|---|
.. | ||
two_factor | ||
new.html.haml | ||
two_factor.html.haml |