Thibaut Girka be4849c083 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system		2019-12-12 15:40:06 +01:00
..
assets	…
chewy/strategy	Fix records not being indexed sometimes (#12024)	2019-10-01 01:19:11 +02:00
devise	…
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	2019-12-12 15:40:06 +01:00
paperclip	Update ESLint and RuboCop in Code Climate (#12534)	2019-12-02 18:25:43 +01:00
tasks	Merge branch 'master' into glitch-soc/merge-upstream	2019-09-30 12:23:57 +02:00
templates	…
cli.rb	…