]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/merge-upstream
authorThibaut Girka <thib@sitedethib.com>
Wed, 18 Sep 2019 15:25:56 +0000 (17:25 +0200)
committerThibaut Girka <thib@sitedethib.com>
Wed, 18 Sep 2019 15:25:56 +0000 (17:25 +0200)
commit5cadb4723832b91068ee51955b9d4b1336502369
tree2e915e53ee0d25ea63ee3910ae8ced44f3295e21
parentab646fac5f582fe9bef22d8b9a4995fbb4b42d7d
parentd0c2c5278391b82ba7fa2f230bf237805ff61a0c
Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- app/controllers/auth/sessions_controller.rb
  Minor conflict due to glitch-soc's theming code
19 files changed:
Gemfile
Gemfile.lock
app/controllers/auth/sessions_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/packs/public.js
app/presenters/instance_presenter.rb
app/services/process_mentions_service.rb
app/views/admin/dashboard/index.html.haml
app/views/admin/tags/index.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/locales/simple_form.en.yml
db/schema.rb
package.json
yarn.lock