mirror of
https://github.com/funamitech/mastodon
synced 2024-12-12 13:48:35 +09:00
2d09653d50
Conflicts: - app/controllers/application_controller.rb: Upstream added an `include` where we had an extra `include` due to glitch-soc's theming system. Added upstream's new `include`. |
||
---|---|---|
.. | ||
_preview_card_provider.html.haml | ||
index.html.haml |