]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 16 Jan 2019 13:20:07 +0000 (14:20 +0100)
committerThibaut Girka <thib@sitedethib.com>
Wed, 16 Jan 2019 13:20:07 +0000 (14:20 +0100)
commitdbe311f0e97a79f7530c7fe10bcee8b9c70b9904
treeeb42d152d7204d4f109aee195037d82afd842b16
parent077639c27409f897e87522dd18a51801b6cbc40d
parent5363c724fc33e441cd4be22ba0e757b1ac4fd401
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/simple_form.pl.yml
14 files changed:
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
config/locales/ca.yml
config/locales/de.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.pl.yml
config/locales/sk.yml