]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 1 Feb 2019 15:12:20 +0000 (16:12 +0100)
committerThibaut Girka <thib@sitedethib.com>
Fri, 1 Feb 2019 15:12:20 +0000 (16:12 +0100)
commite87bd6d94ad3d9ae85adc48dae9b84e961385404
treec7bcb2d7a1403af5457e8a6f47f424c83983676a
parentf611da489929d2592b61b0c0f7c870ae33782343
parent3de63b3c351c7584e911b4839dff6395d2ccb5ec
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- README.md
  Kept our version
- app/javascript/mastodon/features/compose/components/compose_form.js
  Two changes too close to each other, took both changes
Gemfile.lock
app/helpers/stream_entries_helper.rb
app/javascript/mastodon/features/compose/components/compose_form.js
config/locales/en.yml
config/locales/pl.yml
config/locales/sk.yml
jest.config.js