mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-10-21 06:54:23 +00:00
abfdafef1e
Conflicts: - `app/controllers/auth/setup_controller.rb`: Upstream removed a method close to a glitch-soc theming-related method. Removed the method like upstream did. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
stale.yml | ||
stylelint-matcher.json |