glitchier-soc/app/javascript/mastodon/features/compose
Claire 42f36aa55a Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
2023-07-30 13:49:35 +02:00
..
components Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream 2023-07-30 13:49:35 +02:00
containers Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00
util Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
index.jsx Rewrite actions/modal and reducers/modal with typescript (#24833) 2023-05-25 15:42:37 +02:00