Thibaut Girka 2d8be0a6e1 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream changed it completely. Changed ours to merge upstream's new structure, but keeping most of the information.		2020-07-05 19:35:56 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-30 23:00:20 +02:00
paperclip	Add color extraction for audio thumbnails (#14209)	2020-07-05 18:28:25 +02:00
redis	Change Redis#exists calls to Redis#exists? to avoid deprecation warning (#14191)	2020-07-01 19:05:21 +02:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-06-09 10:39:20 +02:00
templates
cli.rb	Fix help text around tootctl email_domain_blocks (#14147)	2020-06-26 21:28:40 +02:00