mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-25 01:24:02 -05:00
c81d1b0d38
Conflicts: - `app/javascript/packs/admin.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. - `app/javascript/packs/public.jsx`: Upstream reworked imports, but we had many changes. Reworked imports as upstream did. |
||
---|---|---|
.. | ||
components | ||
containers | ||
util | ||
index.jsx |