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 | ||
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 | ||