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.

Thibaut Girka 0437d70628 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/follower_accounts_controller.rb`: Conflict due to upstream changing suspension logic while glitch-soc has an extra option to hide followers count. Ported upstream changes.		4 years ago
..
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
paperclip	Fix downloading remote media files when server returns empty filename (#14867)	4 years ago
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	5 years ago
tasks	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
templates	…
webpacker	Add subresource integrity for JS and CSS assets (#15096)	4 years ago
cli.rb	Add IP-based rules (#14963)	4 years ago