mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 14:49:01 +09:00
c827a98f19
Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did. |
||
---|---|---|
.. | ||
filter_serializer.rb | ||
instance_serializer.rb |