mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-09-11 20:57:44 +00:00
Conflicts: - `.github/dependabot.yml`: Upstream made changes while we have dropped this file. Keep the file deleted. - `.prettierignore`: Upstream made changes at the end of the file, where we had our extra lines. Just moved our extra lines back at the end. - `app/serializers/initial_state_serializer.rb`: Upstream code style changes. Applied them. - `app/services/backup_service.rb`: Upstream code style changes. Applied them. |
||
---|---|---|
.. | ||
account_associations.rb | ||
account_avatar.rb | ||
account_counters.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
account_merging.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
domain_materializable.rb | ||
domain_normalizable.rb | ||
expireable.rb | ||
follow_limitable.rb | ||
ldap_authenticable.rb | ||
lockable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
pam_authenticable.rb | ||
rate_limitable.rb | ||
redisable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_snapshot_concern.rb | ||
status_threading_concern.rb |