mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-21 20:56:50 +00:00
44a5f1b64a
Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README |
||
---|---|---|
.. | ||
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 | ||
mail_subscriptions_spec.rb | ||
omniauth_callbacks_spec.rb | ||
webfinger_request_spec.rb |