b135b6ba8f
Conflicts: - `app/views/admin/custom_emojis/new.html.haml`: Conflict caused by glitch-soc having a different file size limit constant name. Updated like upstream did while keeping glitch-soc's constant name. |
||
|---|---|---|
| .. | ||
| api | ||
| well_known | ||
| 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 | ||
| invite_spec.rb | ||
| link_headers_spec.rb | ||
| localization_spec.rb | ||
| mail_subscriptions_spec.rb | ||
| omniauth_callbacks_spec.rb | ||
| remote_interaction_helper_spec.rb | ||