Claire c48ec9cb8c Merge commit 'b85c387c5c0527b0ad31c27031a09d361826c5fc' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug.		2023-06-10 16:48:01 +02:00
..
assets.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
auto_annotate_models.rake
branding.rake
db.rake
emojis.rake	Autofix Rubocop Regex Style rules (#23690)	2023-06-06 14:50:51 +02:00
glitchsoc.rake	Fix most rubocop issues (#2165)	2023-04-09 11:25:30 +02:00
mastodon.rake	Autofix Rubocop Regex Style rules (#23690)	2023-06-06 14:50:51 +02:00
repo.rake
statistics.rake
tests.rake	Improve various queries against account domains (#25126)	2023-05-25 09:27:16 +02:00