nyastodon/app/javascript/mastodon/features/compose
Claire b135b6ba8f Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream
Conflicts:
- `app/views/admin/custom_emojis/new.html.haml`:
  Conflict caused by glitch-soc having a different file size limit constant
  name.
  Updated like upstream did while keeping glitch-soc's constant name.
2023-12-19 21:24:01 +01:00
..
components Merge commit '8ebc94dd22a18c28c4c9763b909e92e6ba64e242' into glitch-soc/merge-upstream 2023-12-19 21:24:01 +01:00
containers Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
util Enforce import order with ESLint (#25096) 2023-05-23 17:15:17 +02:00
index.jsx Change icons in web UI (#27385) 2023-10-24 17:45:08 +00:00