Thibaut Girka 45deca65b3 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/packs/public.js`: Conflict because part of that file has been split to `app/javascript/core/settings.js`. Ported those changes there.		2020-07-01 19:23:14 +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	Fix remote files not using Content-Type header, streaming (#14184)	2020-06-30 23:58:02 +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