]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 29 Oct 2018 13:00:41 +0000 (14:00 +0100)
committerThibaut Girka <thib@sitedethib.com>
Mon, 29 Oct 2018 13:00:41 +0000 (14:00 +0100)
commita942ad3062285b6b4984fe92f9bd610829f04456
tree2476b65436959dda09871ee96edca53b53201b96
parent7f22ed0fc912ffbd94e0df4e0d40750dae542b97
parent32f950a7a8d3acfed43d76cb21d0fc06a471bafe
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/simple_form.ja.yml

Not a real conflict, one new string was introduced in
glitch and one in upstream.
16 files changed:
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
config/locales/ca.yml
config/locales/de.yml
config/locales/es.yml
config/locales/gl.yml
config/locales/ja.yml
config/locales/nl.yml
config/locales/oc.yml
config/locales/pl.yml
config/locales/pt-BR.yml
config/locales/simple_form.ja.yml
This page took 0.244928 seconds and 3 git commands to generate.