mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 12:24:31 +00:00
f3a4d57be1
Conflicts: - `README.md`: Discarded upstream changes: we have our own README - `app/controllers/follower_accounts_controller.rb`: Port upstream's minor refactoring |
||
---|---|---|
.. | ||
build-image.yml | ||
check-i18n.yml | ||
codeql.yml | ||
linter.yml | ||
rebase-needed.yml |