]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 15 Jul 2020 13:32:40 +0000 (15:32 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 15 Jul 2020 13:32:40 +0000 (15:32 +0200)
commit3f60b096b51b000905290d69ea05b874b60fa9e0
tree0b8c7011810b4a97523c2c63816735e519f0682c
parent7a23347db5be3f262dbcafbecf768588dc648bda
parentd9cad44ca54374cafa0c97775083bb1bc0a5a3ce
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `config/routes.rb`:
  Upstream disabled E2EE routes, which we did earlier, but slightly
  differently. Took upstream's version.
12 files changed:
.env.production.sample
app/controllers/auth/sessions_controller.rb
app/controllers/tags_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/lib/settings/scoped_settings.rb
app/models/media_attachment.rb
config/environments/production.rb
config/routes.rb
lib/mastodon/version.rb