Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- .rubocop.yml 2 additions, 2 deletions.rubocop.yml
- CHANGELOG.md 67 additions, 0 deletionsCHANGELOG.md
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 9 additions, 9 deletionsGemfile.lock
- app/controllers/concerns/localized.rb 1 addition, 13 deletionsapp/controllers/concerns/localized.rb
- app/javascript/images/logo_transparent_white.svg 1 addition, 0 deletionsapp/javascript/images/logo_transparent_white.svg
- app/javascript/mastodon/features/account/components/header.js 6 additions, 4 deletions...javascript/mastodon/features/account/components/header.js
- app/javascript/mastodon/features/compose/components/poll_form.js 6 additions, 2 deletions...ascript/mastodon/features/compose/components/poll_form.js
- app/javascript/mastodon/locales/ar.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/ar.json
- app/javascript/mastodon/locales/ast.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/ast.json
- app/javascript/mastodon/locales/bg.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/bg.json
- app/javascript/mastodon/locales/bn.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/bn.json
- app/javascript/mastodon/locales/br.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/br.json
- app/javascript/mastodon/locales/ca.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/ca.json
- app/javascript/mastodon/locales/co.json 11 additions, 8 deletionsapp/javascript/mastodon/locales/co.json
- app/javascript/mastodon/locales/cs.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/cs.json
- app/javascript/mastodon/locales/cy.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/cy.json
- app/javascript/mastodon/locales/da.json 5 additions, 2 deletionsapp/javascript/mastodon/locales/da.json
- app/javascript/mastodon/locales/de.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/de.json
- app/javascript/mastodon/locales/defaultMessages.json 22 additions, 5 deletionsapp/javascript/mastodon/locales/defaultMessages.json
Loading
Please register or sign in to comment