mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2025-01-21 01:14:05 +01:00
8089fa6935
Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change. |
||
---|---|---|
.. | ||
admin.html.haml | ||
admin_mailer.text.erb | ||
application.html.haml | ||
auth.html.haml | ||
embedded.html.haml | ||
error.html.haml | ||
helper_frame.html.haml | ||
mailer.html.haml | ||
mailer.text.erb | ||
modal.html.haml |