mirror of
https://git.bsd.gay/fef/nyastodon.git
synced 2024-12-27 08:23:41 +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 | ||
accounts_helper_spec.rb | ||
application_helper_spec.rb | ||
flashes_helper_spec.rb | ||
formatting_helper_spec.rb | ||
home_helper_spec.rb | ||
instance_helper_spec.rb | ||
json_ld_helper_spec.rb | ||
languages_helper_spec.rb | ||
media_component_helper_spec.rb | ||
react_component_helper_spec.rb | ||
routing_helper_spec.rb | ||
settings_helper_spec.rb | ||
statuses_helper_spec.rb | ||
theme_helper_spec.rb |