mirror of
https://git.kescher.at/CatCatNya/catstodon.git
synced 2024-11-22 22:18:06 +01:00
395b9011ee
Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. 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 |