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	…
devise	…
generators	…
json_ld	…
mastodon	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-12 15:40:06 +01:00
paperclip	…
tasks	…
templates	…
cli.rb	…