Thibaut Girka 9adeaf2bfc Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system		2020-01-24 14:37:06 +01: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-01-24 14:37:06 +01:00
paperclip	Fix ruby 2.7 warnings about keyword parameters (#12824)	2020-01-11 21:38:02 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2020-01-24 14:37:06 +01:00
templates	…
cli.rb	Close registration before self-destruct (#12877)	2020-01-21 18:56:18 +01:00