Claire ad9329502a Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/admin.js`: Conflicts due to glitch-soc's theming system. Upstream changes have been ported to `app/javascript/core/admin.js` - `app/models/trends/statuses.rb`: Minor conflict due to glitch-soc's option to allow CWed toots in trends. Ported upstream changes.		2022-05-01 16:52:27 +02:00
..
components	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
containers	Change "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +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 "Direct" status visibility to "Only people I mention" in web UI (#18146)	2022-04-29 00:24:31 +02:00