]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 24 Jun 2019 12:47:48 +0000 (14:47 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 24 Jun 2019 13:02:59 +0000 (15:02 +0200)
commitddd875ad9940c4c7ef53a31af23cd5fe89fcf0c9
tree7926abdec378339ee622a1f09b9a52178f4d0600
parent38d28824475056766c97385b66f4e04a5123e3a2
parent66ac1bd063882f5a2f828c1c702089e37f36f217
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
19 files changed:
.env.production.sample
app/controllers/settings/identity_proofs_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/models/media_attachment.rb
app/models/user.rb
app/serializers/initial_state_serializer.rb
app/serializers/rest/instance_serializer.rb
app/services/post_status_service.rb
app/views/stream_entries/_simple_status.html.haml
config/initializers/doorkeeper.rb
config/locales/doorkeeper.en.yml
config/locales/pl.yml
config/locales/simple_form.ja.yml
config/routes.rb
lib/mastodon/version.rb