mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-30 22:23:43 +01:00
555e33a392
Conflicts: - `app/helpers/application_helper.rb`: Conflict because of our different theming systems. Updated accordingly, along with `app/helpers/theme_helper.rb` and `app/helpers/theme_helper_spec.rb`. |
||
---|---|---|
.. | ||
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 |