Jeremy Kescher 0406f173cf Merge remote-tracking branch 'reactions/main' into develop ... # Conflicts: # app/javascript/flavours/glitch/locales/de.js		2022-12-17 11:09:32 +01:00
..
components	Merge remote-tracking branch 'reactions/main' into develop	2022-12-17 11:09:32 +01:00
containers	Port navigation bar from upstream (#1986)	2022-12-01 20:06:08 +01:00
util	Move some modules from flavours/glitch/utils/ back to flavours/glitch/features/compose/util/	2022-10-11 12:15:08 +02:00
index.js	[Glitch] Fix redirecting to /publish when compose form is visible in web UI	2022-10-28 19:26:28 +02:00