Jeremy Kescher 004b22602b Merge branch 'emoji-reactions-base' into develop ... # Conflicts: # app/javascript/flavours/glitch/components/status.jsx # app/javascript/flavours/glitch/locales/en.json # app/javascript/flavours/glitch/styles/components.scss		2024-02-24 11:08:13 +01:00
..
action_bar.jsx	Fix certain jsx files being in an old state in relation to the emoji reactions PR	2024-02-16 15:12:22 +01:00
card.jsx	Adopt upstream's design for preview cards (#2634)	2024-02-19 22:47:01 +01:00
detailed_status.jsx	Merge branch 'glitch-soc' into develop	2024-01-17 22:37:29 +01:00