]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Tue, 26 Mar 2019 15:02:54 +0000 (16:02 +0100)
committerThibaut Girka <thib@sitedethib.com>
Tue, 26 Mar 2019 15:02:54 +0000 (16:02 +0100)
commitb9f314bba754074c7ac7dad37cdd35a0cbf1d1b5
tree987f8ceff468686d7f4185cf2312e56aed45ecd1
parent648cf8bfd51913929b7d0d3a637de496d6e40f89
parent0c1a05b281c2665b52a644d51b9b06c2756479a7
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- config/locales/es.yml
- config/locales/pl.yml
- config/locales/pt-BR.yml
Gemfile
Gemfile.lock
app/controllers/directories_controller.rb
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/models/account.rb
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml