mirror of
https://github.com/mastodon/mastodon.git
synced 2025-03-14 13:44:55 +01:00
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. - `app/controllers/concerns/two_factor_authentication_concern.rb`: Conflict caused because of glitch-soc's theming system. Took upstream's new code and applied the theming system changes on top of it. |
||
---|---|---|
.. | ||
index.js |