mastodon-glitch/app/javascript/mastodon/features/compose
Claire fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
2024-09-03 21:51:53 +02:00
..
components Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 2024-09-03 21:51:53 +02:00
containers `frequentlyUsedLanguages` not updated correctly (#31386) 2024-09-03 15:55:13 +00:00
util Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
index.jsx Change design of confirmation modals in web UI (#30884) 2024-07-25 17:05:54 +00:00