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
..
components	Merge branch 'emoji-reactions-base' into develop	2024-02-24 11:08:13 +01:00
containers	Remove leftovers from glitch-soc's layout option	2024-02-08 19:21:35 +01:00
util	Fix import order with ESLint	2023-05-28 16:38:10 +02:00
index.jsx	Reduce differences with upstream due to import style (#2465)	2023-11-15 12:01:51 +01:00