mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-10 17:05:17 +00:00
9a3d91f629
Conflicts: - `app/models/concerns/domain_materializable.rb`: Fixed a code style issue upstream in a PR that got merged in glitch-soc earlier. Changed the code to match upstream's. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
workflows | ||
FUNDING.yml | ||
stale.yml | ||
stylelint-matcher.json |