59864ff495
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
---|---|---|
.. | ||
_bio.html.haml | ||
_header.html.haml | ||
_moved.html.haml | ||
_og.html.haml | ||
show.html.haml |
59864ff495
Conflicts: - `.github/dependabot.yml`: Upstream modified it, but we deleted it in glitch-soc. Keep it deleted. |
||
---|---|---|
.. | ||
_bio.html.haml | ||
_header.html.haml | ||
_moved.html.haml | ||
_og.html.haml | ||
show.html.haml |