mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2025-02-10 21:44:44 +00:00
Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns. |
||
---|---|---|
.. | ||
api | ||
account_show_page_spec.rb | ||
anonymous_cookies_spec.rb | ||
backups_spec.rb | ||
cache_spec.rb | ||
catch_all_route_request_spec.rb | ||
content_security_policy_spec.rb | ||
follower_accounts_spec.rb | ||
following_accounts_spec.rb | ||
host_meta_request_spec.rb | ||
link_headers_spec.rb | ||
localization_spec.rb | ||
omniauth_callbacks_spec.rb | ||
webfinger_request_spec.rb |