Claire fc1dd81ea5 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Not a real conflict, upstream dependency updated textually too close to a glitch-soc-only dependency. Updated the upstream dependency.		2022-04-27 08:48:21 +02:00
..
assets.rake	Override current_user when generating static pages	2018-12-19 20:49:58 +01:00
auto_annotate_models.rake	Add announcements (#12662)	2020-01-23 22:00:13 +01:00
db.rake	Fix null values being included in some indexes (#17711)	2022-03-12 08:12:57 +01:00
emojis.rake	Update emoji codepoint mappings to v13.1 (#16352)	2021-06-03 16:08:07 +02:00
glitchsoc.rake
mastodon.rake	Change mastodon:webpush:generate_vapid_key task to not require functional env (#17338)	2022-01-20 14:51:23 +01:00
repo.rake	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statistics.rake
tests.rake	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00