Claire 231787710a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `streaming/index.js`: Filtering code for streaming notifications has been refactored upstream, but glitch-soc had similar code for local-only toots in the same places. Ported upstream changes, but did not refactor local-only filtering.		2021-09-26 18:28:59 +02:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2021-09-26 18:28:59 +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	Change routing paths to use usernames in web UI (#16171)	2021-09-26 05:46:13 +02:00