mirror of
https://github.com/funamitech/mastodon
synced 2024-12-15 07:09:03 +09:00
c2f0ea415e
Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. |
||
---|---|---|
.. | ||
admin.jsx | ||
common.js | ||
error.js | ||
home.js | ||
public.jsx | ||
settings.js | ||
share.jsx | ||
sign_up.js |