mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2025-01-16 02:24:04 +01:00
c2f0ea415e
Conflicts: - `app/javascript/packs/admin.jsx`: Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`. |
||
---|---|---|
.. | ||
glitch | ||
vanilla |