You can not 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 5e11f3a6e1 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/mastodon/modal.scss`: For some reason we changed the file loading path in glitch-soc, but now upstream has completely changed how the logo is loaded. Applied upstream changes.		4 years ago
..
action_dispatch	Drop dependency on secure_headers, fix response headers (#15712)	4 years ago
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	Fixed code quality issues (#15541)	4 years ago
mastodon	Merge branch 'main' into glitch-soc/merge-upstream	4 years ago
paperclip	Fixed code quality issues (#15541)	4 years ago
rails	Fix obsolete digitalocean.rake file breaking rake tasks (#15618)	4 years ago
redis	…
tasks	…
templates	…
webpacker	…
cli.rb	…
enumerable.rb	…