]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Fri, 24 Jan 2020 13:37:06 +0000 (14:37 +0100)
committerThibaut Girka <thib@sitedethib.com>
Fri, 24 Jan 2020 13:37:06 +0000 (14:37 +0100)
commit9adeaf2bfc1c16ca70e611b5288886b21414217b
tree53372bc9bd6f38d158aad50c768e18773b7d3f3b
parenta8c109baca4d02cc8aed454e231518c1f8ec1844
parent4bae4e972d43f71bffb888ac82c180b2fa3f1ada
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `app/controllers/statuses_controller.rb`:
  Minor conflict due to theming system
24 files changed:
.env.production.sample
app/controllers/auth/passwords_controller.rb
app/controllers/auth/registrations_controller.rb
app/controllers/relationships_controller.rb
app/controllers/statuses_controller.rb
app/javascript/mastodon/locales/defaultMessages.json
app/javascript/mastodon/locales/en.json
app/javascript/mastodon/locales/ja.json
app/javascript/mastodon/locales/pl.json
app/javascript/styles/mastodon/components.scss
app/lib/formatter.rb
app/lib/sanitize_config.rb
app/models/account.rb
app/models/media_attachment.rb
app/models/user.rb
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
config/locales/simple_form.ja.yml
config/navigation.rb
config/routes.rb
db/schema.rb
lib/mastodon/version.rb