mirror of https://github.com/tootsuite/mastodon
ddd875ad99
Conflicts: - app/models/media_attachment.rb Upstream added audio attachment support - app/serializers/initial_state_serializer.rb Upstream added audio attachment support and how mimetypes are returned - app/serializers/rest/instance_serializer.rb Upstream added a few fields - config/application.rb Upstream added a different paperclip transcoder |
||
|---|---|---|
| .. | ||
| account_associations.rb | ||
| account_avatar.rb | ||
| account_counters.rb | ||
| account_finder_concern.rb | ||
| account_header.rb | ||
| account_interactions.rb | ||
| attachmentable.rb | ||
| cacheable.rb | ||
| domain_normalizable.rb | ||
| expireable.rb | ||
| ldap_authenticable.rb | ||
| omniauthable.rb | ||
| paginable.rb | ||
| pam_authenticable.rb | ||
| redisable.rb | ||
| relationship_cacheable.rb | ||
| remotable.rb | ||
| status_threading_concern.rb | ||
| streamable.rb | ||
| user_roles.rb | ||