mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
eb3aed9545
Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |