mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-15 19:33:32 +00:00
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. |
||
---|---|---|
.. | ||
challenges | ||
confirmations | ||
passwords | ||
registrations | ||
sessions | ||
setup | ||
shared |