]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Sat, 7 Dec 2019 11:28:59 +0000 (12:28 +0100)
committerThibaut Girka <thib@sitedethib.com>
Sat, 7 Dec 2019 11:28:59 +0000 (12:28 +0100)
commitabcba5c19885f789557fe1fa62dba7f176d9afe6
tree67628941bd27b7887f92ae758db7d81f34823e62
parent7d59e25fbd7a0209c11cbe6aac4400bbca4de82b
parent6d7daf6154b1edbfe9a0c0b297baab8cd45658f3
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- package.json
  Not really a conflict, caused by an additional dependency in glitch-soc.
- yarn.lock
  Not really a conflict, caused by an additional dependency in glitch-soc.
13 files changed:
.env.production.sample
Gemfile
Gemfile.lock
app/helpers/accounts_helper.rb
app/javascript/mastodon/features/compose/components/poll_form.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/models/account.rb
app/models/media_attachment.rb
app/serializers/rest/account_serializer.rb
config/locales/en.yml
package.json
yarn.lock