mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-19 03:37:04 +00:00
7635c67450
Conflicts: - `app/views/layouts/application.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. - `app/views/layouts/embedded.html.haml`: Upstream removed the `crossorigin` attribute from `preload_pack_asset`. Glitch-soc had different calls to `preload_pack_asset` because of the different theming system. Ported the change. |
||
---|---|---|
.. | ||
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 |