mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-27 02:54:19 +00:00
443ec4f8ba
Conflicts: - `app/views/admin/tags/index.html.haml`: Removed upstream while it had changes in glitch-soc to accomodate for the theming system. Additional changes to accomodate for the theming system: - `app/views/admin/trends/links/preview_card_providers/index.html.haml` - `app/views/admin/trends/links/index.html.haml` - `app/views/admin/trends/tags/index.html.haml` - `app/views/admin/tags/show.html.haml` |
||
---|---|---|
.. | ||
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 |