Thibaut Girka 23cd5f2c15 Merge branch 'master' into glitch-soc/merge-upstream		2020-08-02 14:30:28 +02:00
..
assets
chewy/strategy
devise
generators
json_ld
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-08-01 20:24:23 +02:00
paperclip	Change content-type to be always computed from file data (#14452)	2020-08-02 11:21:10 +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