mirror of
https://github.com/mastodon/mastodon.git
synced 2024-11-30 16:41:55 +00: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`. |
||
---|---|---|
.. | ||
delivery_worker.rb | ||
distribute_poll_update_worker.rb | ||
distribution_worker.rb | ||
fetch_replies_worker.rb | ||
low_priority_delivery_worker.rb | ||
post_upgrade_worker.rb | ||
processing_worker.rb | ||
raw_distribution_worker.rb | ||
reply_distribution_worker.rb | ||
synchronize_featured_collection_worker.rb | ||
update_distribution_worker.rb |