Claire 15929a3d59 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Our README is completely different. Discarded upstream changes. - `app/javascript/packs/mailer.js`: We had removed the file. Move the changes to `app/javascript/core/mailer.js`.		2022-06-11 00:08:41 +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
branding.rake	Change brand color and logotypes (#18592)	2022-06-09 22:25:23 +02:00
db.rake	Fix null values being included in some indexes (#17711)	2022-03-12 08:12:57 +01:00
emojis.rake	Fix light-mode emoji borders. (#18131)	2022-04-29 19:23:03 +02:00
glitchsoc.rake	Add Rake task to backfill local-only flag (#253)	2017-12-10 22:49:59 -06:00
mastodon.rake	Fix redis configuration not being changed by mastodon:setup (#18383)	2022-05-09 23:19:11 +02:00
repo.rake	Remove language detection through cld3 (#17478)	2022-02-08 02:41:17 +01:00
statistics.rake	add task to report code statistics (#2489)	2017-04-26 18:47:22 +02:00
tests.rake	Fix instance actor being incorrectly created when running migrations (#18109)	2022-04-26 21:22:09 +02:00