mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-11-17 04:13:01 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
build-image.yml | ||
build-nightly.yml | ||
check-i18n.yml | ||
codeql.yml | ||
haml-lint-problem-matcher.json | ||
lint-css.yml | ||
lint-haml.yml | ||
lint-js.yml | ||
lint-json.yml | ||
lint-md.yml | ||
lint-ruby.yml | ||
lint-yml.yml | ||
rebase-needed.yml | ||
test-js.yml | ||
test-migrations-one-step.yml | ||
test-migrations-two-step.yml | ||
test-ruby.yml |