]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 8 Apr 2019 13:57:56 +0000 (15:57 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 8 Apr 2019 13:57:56 +0000 (15:57 +0200)
commitf5f6d23d554b3a81020feebc65188cc64f644095
treeb30197858c2018a32be559f5b4b479571c75dee3
parent30500dff7cbf27fbee6eb45e20cc24ca0b7a9e77
parent3f036ac6b8f9919b3b141012db163476f18fe299
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
17 files changed:
Gemfile
Gemfile.lock
app/controllers/home_controller.rb
app/controllers/shares_controller.rb
app/helpers/stream_entries_helper.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
app/models/account.rb
app/presenters/instance_presenter.rb
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/navigation.rb
config/routes.rb