Claire 8391d975d7 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `Gemfile.lock`: Not a real conflict, upstream-updated dependency (redis) textually too close to glitch-soc-only dependecy. Updated redis gem like upstream did.		2021-08-09 23:25:49 +02:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2021-06-03 20:47:02 +02:00
containers	Fix logout link not working in safari (#16574)	2021-08-06 12:14:13 +02:00
util	Update twitter-text from 1.14 to 3.1.0 and fix toot character counting (#15382)	2021-03-02 12:02:56 +01:00
index.js	Fix logout link not working in safari (#16574)	2021-08-06 12:14:13 +02:00