Thibaut Girka 27b5143dc4 Merge branch 'master' into glitch-soc/merge-upstream		2020-05-20 18:22:42 +02:00
..
assets	…
chewy/strategy	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2020-05-20 18:22:42 +02:00
paperclip	Fix GifReader exceptions (#13760)	2020-05-15 11:38:12 +02:00
tasks	…
templates	…
cli.rb	Add separate cache directory for non-local uploads (#12821)	2020-04-26 23:29:08 +02:00