mirror of
https://github.com/mastodon/mastodon.git
synced 2024-12-14 07:05:11 +01:00
c1c514ca70
Manually-resolved conflicts: .circleci/config.yml app/controllers/accounts_controller.rb app/controllers/auth/passwords_controller.rb app/controllers/statuses_controller.rb app/javascript/packs/public.js app/models/media_attachment.rb app/views/stream_entries/_content_spoiler.html.haml app/views/stream_entries/_media.html.haml config/locales/en.yml config/locales/ja.yml config/locales/pl.yml lib/mastodon/version.rb Some content from app/javascript/packs/public.js has been split to app/javascript/core/settings.js. Translation strings for glitch-soc's keyword mutes were dropped. Everything else was mostly “take both”. |
||
---|---|---|
.. | ||
account_avatar.rb | ||
account_finder_concern.rb | ||
account_header.rb | ||
account_interactions.rb | ||
attachmentable.rb | ||
cacheable.rb | ||
expireable.rb | ||
omniauthable.rb | ||
paginable.rb | ||
relationship_cacheable.rb | ||
remotable.rb | ||
status_threading_concern.rb | ||
streamable.rb |