f56a3dc4e2
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
---|---|---|
.. | ||
_account.html.haml | ||
index.html.haml | ||
show.html.haml |
f56a3dc4e2
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
---|---|---|
.. | ||
_account.html.haml | ||
index.html.haml | ||
show.html.haml |