mirror of
https://github.com/funamitech/mastodon
synced 2024-12-06 02:39:04 +09:00
322e907e04
Conflicts: - `app/views/settings/preferences/appearance/show.html.haml`: Upstream renamed some helper functions that were used in a part of the settings page which glitch-soc slightly changed the layout of. Ported the change. |
||
---|---|---|
.. | ||
admin | ||
settings | ||
accounts_helper_spec.rb | ||
application_helper_spec.rb | ||
flashes_helper_spec.rb | ||
home_helper_spec.rb | ||
instance_helper_spec.rb | ||
jsonld_helper_spec.rb | ||
languages_helper_spec.rb | ||
routing_helper_spec.rb | ||
statuses_helper_spec.rb |