You cannot 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 32c70d2f09 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2 years ago
..
assets.rake	…
auto_annotate_models.rake	Add announcements (#12662)	4 years ago
branding.rake	Fix wrong aspect ratio of logo in icons (#18639)	2 years ago
db.rake	Fix null values being included in some indexes (#17711)	2 years ago
emojis.rake	Add assets from Twemoji 14.0 (#19733)	2 years ago
glitchsoc.rake	…
mastodon.rake	Copied Spaces support from packer .rake (#20573)	2 years ago
repo.rake	Remove language detection through cld3 (#17478)	2 years ago
statistics.rake	…
tests.rake	Fix admin action logs page (#19649)	2 years ago