]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 10 May 2019 15:09:12 +0000 (17:09 +0200)
committerThibaut Girka <thib@sitedethib.com>
Fri, 10 May 2019 15:09:12 +0000 (17:09 +0200)
commit68629f2773a056b0120b956e0cb425e73fe57cab
tree94f79c3baeec31b58d36e37515b753b9d2a02ab6
parent3191c3b349f67442f3ae42be6e1b141e2392a293
parent780d99c204df824fe959a3db00999f973a29c351
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/statuses_controller.rb
  minor conflict because of glitch-soc's theming system
- app/controllers/stream_entries_controller.rb
  minor conflict because of glitch-soc's theming system
13 files changed:
.env.production.sample
Gemfile
Gemfile.lock
app/controllers/statuses_controller.rb
app/controllers/stream_entries_controller.rb
app/javascript/mastodon/features/compose/components/compose_form.js
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/styles/mastodon/components.scss
config/locales/ja.yml
db/schema.rb
lib/mastodon/version.rb