Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests. |
||
|---|---|---|
| .. | ||
| admin.tsx | ||
| application.ts | ||
| common.js | ||
| error.ts | ||
| inert.ts | ||
| mailer.ts | ||
| public-path.ts | ||
| public.tsx | ||
| remote_interaction_helper.ts | ||
| share.tsx | ||
| sign_up.ts | ||
| two_factor_authentication.ts | ||