]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Mon, 1 Apr 2019 19:28:31 +0000 (21:28 +0200)
committerThibaut Girka <thib@sitedethib.com>
Mon, 1 Apr 2019 19:28:31 +0000 (21:28 +0200)
commit12dae9d58316bec32adaac016998ab1cf69d2b45
tree4ddadcc66d07a1edfcfb9ff0f9cda7cf107d6b46
parent925830d11bb5c132e282f82bdb2ca893d87c9c24
parent120544067fcca4bf6e71ba1ffb276c451c17c656
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/models/form/admin_settings.rb
- config/locales/ja.yml
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/models/account.rb
app/models/form/admin_settings.rb
config/locales/en.yml
config/locales/ja.yml