mirror of
https://github.com/funamitech/mastodon
synced 2024-12-14 14:49:01 +09:00
1cd7f5ff17
Conflicts: - `.eslintrc.js`: Upstream moved a configuration block in which we had added a glitch-only path. Moved the configuration block as upstream did. - other files: Upstream reordered imports, and those files had different ones. Kept our version and reordered imports using the same rules. |
||
---|---|---|
.. | ||
announcements.jsx | ||
trends.jsx |