Thibaut Girka 27b5143dc4 Merge branch 'master' into glitch-soc/merge-upstream		2020-05-20 18:22:42 +02:00
..
assets	…
chewy/strategy	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
devise	Fix authentication before 2FA challenge (#11943)	2019-09-24 04:35:36 +02:00
generators	…
json_ld	Fix preloaded JSON-LD context for identity not being used (#12138)	2019-10-10 06:48:53 +02:00
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	Merge branch 'master' into glitch-soc/merge-upstream	2020-04-20 16:45:40 +02:00
templates	…
cli.rb	Add separate cache directory for non-local uploads (#12821)	2020-04-26 23:29:08 +02:00