e25cc4deb7
Conflicts: - `config/navigation.rb`: Conflict due to glitch-soc having extra navigation items for its theming system. Ported upstream changes. |
||
|---|---|---|
| .. | ||
| 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 | ||