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. |
||
|---|---|---|
| .. | ||
| access_tokens_vacuum.rb | ||
| applications_vacuum.rb | ||
| backups_vacuum.rb | ||
| feeds_vacuum.rb | ||
| imports_vacuum.rb | ||
| media_attachments_vacuum.rb | ||
| preview_cards_vacuum.rb | ||
| statuses_vacuum.rb | ||
| system_keys_vacuum.rb | ||