mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 18:28:50 +09:00
c0dc247bce
Conflicts: - app/models/account.rb - app/views/settings/profiles/show.html.haml - spec/controllers/api/v1/accounts/credentials_controller_spec.rb Conflicts were due to an increase in account bio length upstream, which is already covered in glitch-soc through `MAX_BIO_CHARS`. |
||
---|---|---|
.. | ||
ISSUE_TEMPLATE | ||
CODEOWNERS | ||
FUNDING.yml |