Merge branch 'main' into glitch-soc/merge-upstream

This commit is contained in:
Claire 2023-01-13 10:31:52 +01:00
commit b52dc5f69d

View file

@ -399,7 +399,7 @@ namespace :mastodon do
escaped = dotenv_escape(value) escaped = dotenv_escape(value)
incompatible_syntax = true if value != escaped incompatible_syntax = true if value != escaped
escaped "#{key}=#{escaped}"
end.join("\n") end.join("\n")
generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup generated_header = "# Generated with mastodon:setup on #{Time.now.utc}\n\n".dup