mirror of
https://github.com/funamitech/mastodon
synced 2024-12-13 14:18:34 +09:00
dc68306b8e
Conflicts: - `app/views/layouts/application.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. - `app/views/layouts/embedded.html.haml`: Conflicts due to glitch-soc's theming system. Added `crossorigin: 'anonymous'` like upstream did, to the glitch-soc-specific code. |
||
---|---|---|
.. | ||
_theme.html.haml | ||
admin.html.haml | ||
application.html.haml | ||
auth.html.haml | ||
embedded.html.haml | ||
error.html.haml | ||
mailer.html.haml | ||
mailer.text.erb | ||
modal.html.haml | ||
plain_mailer.html.haml |