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. |
||
|---|---|---|
| .. | ||
| credentials_controller_spec.rb | ||
| familiar_followers_controller_spec.rb | ||
| follower_accounts_controller_spec.rb | ||
| following_accounts_controller_spec.rb | ||
| identity_proofs_controller_spec.rb | ||
| lists_controller_spec.rb | ||
| lookup_controller_spec.rb | ||
| notes_controller_spec.rb | ||
| pins_controller_spec.rb | ||
| search_controller_spec.rb | ||
| statuses_controller_spec.rb | ||