You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		3 years ago
..
migrate	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
post_migrate	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
views	Fix some old migration scripts (#17394)	3 years ago
schema.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
seeds.rb	Change unconfirmed user login behaviour (#11375)	5 years ago