]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 19 Jun 2019 14:19:32 +0000 (16:19 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 19 Jun 2019 16:36:16 +0000 (18:36 +0200)
commit356e9150dfec5bbb8a56b128c1d3372cd5731ec6
treeb5270b3fe3c38ef2d94670f06613c4bdf71d0631
parentf4b008906dcfc3333ec533884aa10b65f8ae41a2
parentede0be5dba6836606db772a007ad9be5d60c7b99
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/lib/sanitize_config.rb
  Keep our version, we support the tags upstream transforms.
- package.json
- yarn.lock
Gemfile
Gemfile.lock
app/models/user.rb
config/locales/ja.yml
package.json
spec/lib/sanitize_config_spec.rb
yarn.lock