| Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did. | ||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.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. | ||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| seeds | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||