Claire 392ca0472a 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
..
_instance.html.haml	Add tooltip for instance delivery warnings (#17854)	2022-03-22 18:41:46 +01:00
index.html.haml	Pre-fill domain block/allow domain from search filter (#18172)	2022-04-29 00:24:44 +02:00
show.html.haml	Merge branch 'main' into glitch-soc/merge-upstream	2022-03-26 19:18:55 +01:00