Thibaut Girka 3f60b096b5 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `config/routes.rb`: Upstream disabled E2EE routes, which we did earlier, but slightly differently. Took upstream's version.		2020-07-15 15:32:40 +02:00
..
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-07-15 15:32:40 +02:00
paperclip	Fix ogg vorbis files with a cover art not being correctly processed (#14255)	2020-07-07 16:32:14 +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