]> cat aescling's git repositories - mastodon.git/commit
Merge branch 'master' into glitch-soc/master
authorThibaut Girka <thib@sitedethib.com>
Thu, 19 Dec 2019 12:52:54 +0000 (13:52 +0100)
committerThibaut Girka <thib@sitedethib.com>
Thu, 19 Dec 2019 12:52:54 +0000 (13:52 +0100)
commitab5ff638f2968e3f434e504c7caab370bf71c9c0
tree172f2c2fc8192688b960dd2bd42ea126ad9245fb
parent66ab1f83b0d342341181e0c88da83c966391fc0c
parent902c6bed5aab12c2e97af3452f122247777226af
Merge branch 'master' into glitch-soc/master

Conflicts:
- `config/locales/en.yml`
  No real conflict, upstream added a translatable string “too close” to
  one specific to glitch-soc
- `lib/mastodon/statuses_cli.rb`
  Fixes made upstream, while changed in glitch-soc to keep bookmarked statuses
- `package.json`
  No real conflict, additional dependency in glitch-soc
19 files changed:
Gemfile
Gemfile.lock
app/javascript/core/admin.js
app/javascript/mastodon/features/compose/components/poll_form.js
app/javascript/styles/mastodon/admin.scss
app/javascript/styles/mastodon/components.scss
app/models/form/admin_settings.rb
app/services/backup_service.rb
app/views/admin/reports/show.html.haml
app/views/admin/settings/edit.html.haml
app/views/layouts/admin.html.haml
config/locales/en.yml
config/locales/ja.yml
config/locales/pl.yml
config/settings.yml
db/schema.rb
lib/mastodon/statuses_cli.rb
package.json
yarn.lock