Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
|---|---|---|
| .. | ||
| components | ||
| containers | ||
| util | ||
| index.js | ||