mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 03:37:04 +00:00
c48ec9cb8c
Conflicts: - `config/initializers/content_security_policy.rb`: Kept our version, it was not affected by upstream's bug. |
||
---|---|---|
.. | ||
action_controller | ||
active_record | ||
assets | ||
chewy/strategy | ||
devise | ||
generators/post_deployment_migration | ||
json_ld | ||
linter | ||
mastodon | ||
paperclip | ||
rails | ||
redis | ||
sanitize_ext | ||
simple_navigation | ||
tasks | ||
templates/haml/scaffold | ||
terrapin | ||
webpacker | ||
exceptions.rb | ||
public_file_server_middleware.rb |