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
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
views	Fix some old migration scripts (#17394)	2022-01-30 21:38:54 +01:00
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-05-01 16:52:27 +02:00
seeds.rb	Change unconfirmed user login behaviour (#11375)	2019-07-22 10:48:50 +02:00