mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +09:00
f6654e0842
Conflicts: - `app/javascript/packs/admin.jsx`: This file was split between `app/javascript/core/admin.js`, `app/javascript/pack/admin.jsx`, and `app/javascript/flavours/glitch/packs/admin.jsx`. Ported upstream's change, splitting the new file to `app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`, and `app/javascript/flavours/glitch/packs/admin.tsx` |
||
---|---|---|
.. | ||
names.yml | ||
theme.yml |