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	[Glitch] Add toast with option to open post after publishing in web UI	2023-12-03 16:38:41 +01:00
index.jsx	[Glitch] Add a new @/ alias for the root frontend directory and use it where possible	2024-01-16 12:21:13 +01:00