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 |
||
|---|---|---|
| .. | ||
| v1 | ||
| v2 | ||
| web | ||
| base_controller.rb | ||
| oembed_controller.rb | ||
| proofs_controller.rb | ||
| push_controller.rb | ||
| salmon_controller.rb | ||
| subscriptions_controller.rb | ||