1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-15 15:18:30 +09:00
YuruToot/app/javascript/mastodon/features/onboarding
Claire d8b0a732aa Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/simple_form.rb`:
  Upstream added a new simple_form component, where we had an extra one.
  Kept both components.
2023-06-10 16:22:14 +02:00
..
components Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
follows.jsx Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00
index.jsx Merge commit '1483a3ddfe74e4fb81d87447a1781943eab86c60' into glitch-soc/merge-upstream 2023-06-10 16:22:14 +02:00
share.jsx Upgrade react-intl (#24906) 2023-05-31 23:43:39 +02:00