You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/config
Thibaut Girka ddd875ad99 Merge branch 'master' into glitch-soc/merge-upstream
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
7 years ago
..
environments
initializers Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
locales Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
webpack Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 7 years ago
application.rb Fix converted media being saved with original extension and mime type (#11130) 7 years ago
boot.rb
brakeman.ignore
database.yml
deploy.rb
environment.rb
i18n-tasks.yml Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
navigation.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
puma.rb
routes.rb Merge branch 'master' into glitch-soc/merge-upstream 7 years ago
secrets.yml
settings.yml Merge remote-tracking branch 'upstream/master' into glitch-soc/merge-upstream 7 years ago
sidekiq.yml
webpacker.yml