Claire d8fdbb054e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/validators/status_length_validator.rb`: Upstream changes too close to glitch-soc MAX_CHARS changes, but not a real conflict. Applied upstream changes. - `package.json`: glitch-soc-only dependency textually too close to a dependency updated upstream, not a real conflict. Applied upstream changes.		2021-03-02 12:06:58 +01:00
..
assets.rake	…
auto_annotate_models.rake	…
db.rake	Fix post-migration warning about index corruption being too scary (#15223)	2020-11-27 15:41:43 +01:00
emojis.rake	Add borders to 📱 and 📲 emojis (#15794)	2021-03-01 21:22:54 +01:00
glitchsoc.rake	…
mastodon.rake	Fix external user creation failing when invite request text is required (#15405)	2020-12-22 17:14:32 +01:00
repo.rake	…
statistics.rake	…