f09f5b35f2
Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb` |
||
|---|---|---|
| .. | ||
| __mocks__ | ||
| entrypoints | ||
| flavours | ||
| fonts | ||
| hooks | ||
| icons | ||
| images | ||
| mastodon | ||
| material-icons | ||
| skins | ||
| styles | ||
| svg-icons | ||
| types | ||