]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 27 Mar 2020 20:54:44 +0000 (21:54 +0100)
committerThibaut Girka <thib@sitedethib.com>
Fri, 27 Mar 2020 20:54:44 +0000 (21:54 +0100)
commit7b435fd9bf81265241fab792d8e8e0c2f4f1b619
treeef366f436ed5180489cc9377268e10328fe9a932
parent02f1c04fabab221130de8dfb5611be81825b193b
parent6c79b7237e31eb510af7df3f4f2cb133dea39845
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/services/post_status_service.rb`:
  CW/sensitive logic fixed upstream, but different in glitch-soc.
  Ported the changes accordingly.
Gemfile
Gemfile.lock
app/javascript/mastodon/locales/ja.json
app/models/media_attachment.rb
app/services/post_status_service.rb
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.ja.yml
config/locales/simple_form.pl.yml
package.json
yarn.lock