mirror of
https://github.com/mastodon/mastodon.git
synced 2025-12-16 00:52:42 +00:00
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 |
||
|---|---|---|
| .. | ||
| exports | ||
| preferences | ||
| two_factor_authentication | ||
| applications_controller.rb | ||
| base_controller.rb | ||
| deletes_controller.rb | ||
| exports_controller.rb | ||
| featured_tags_controller.rb | ||
| flavours_controller.rb | ||
| identity_proofs_controller.rb | ||
| imports_controller.rb | ||
| migrations_controller.rb | ||
| preferences_controller.rb | ||
| profiles_controller.rb | ||
| sessions_controller.rb | ||
| two_factor_authentications_controller.rb | ||