mirror of https://github.com/Siphonay/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 |
||
|---|---|---|
| .. | ||
| accounts_cli.rb | ||
| cache_cli.rb | ||
| cli_helper.rb | ||
| domains_cli.rb | ||
| emoji_cli.rb | ||
| feeds_cli.rb | ||
| media_cli.rb | ||
| migration_helpers.rb | ||
| premailer_webpack_strategy.rb | ||
| redis_config.rb | ||
| search_cli.rb | ||
| settings_cli.rb | ||
| snowflake.rb | ||
| statuses_cli.rb | ||
| version.rb | ||