Merge tag 'v2.9.3' into instance_only_statuses
Showing
- CHANGELOG.md 59 additions, 0 deletionsCHANGELOG.md
- Dockerfile 1 addition, 0 deletionsDockerfile
- Gemfile.lock 1 addition, 1 deletionGemfile.lock
- Procfile 13 additions, 1 deletionProcfile
- app/chewy/statuses_index.rb 1 addition, 1 deletionapp/chewy/statuses_index.rb
- app/controllers/about_controller.rb 2 additions, 0 deletionsapp/controllers/about_controller.rb
- app/controllers/admin/domain_blocks_controller.rb 1 addition, 1 deletionapp/controllers/admin/domain_blocks_controller.rb
- app/controllers/api/v1/accounts/statuses_controller.rb 2 additions, 1 deletionapp/controllers/api/v1/accounts/statuses_controller.rb
- app/controllers/application_controller.rb 7 additions, 7 deletionsapp/controllers/application_controller.rb
- app/controllers/concerns/localized.rb 8 additions, 5 deletionsapp/controllers/concerns/localized.rb
- app/controllers/invites_controller.rb 1 addition, 1 deletionapp/controllers/invites_controller.rb
- app/controllers/settings/two_factor_authentication/confirmations_controller.rb 1 addition, 1 deletion...ngs/two_factor_authentication/confirmations_controller.rb
- app/controllers/settings/two_factor_authentication/recovery_codes_controller.rb 1 addition, 1 deletion...gs/two_factor_authentication/recovery_codes_controller.rb
- app/javascript/mastodon/actions/compose.js 1 addition, 1 deletionapp/javascript/mastodon/actions/compose.js
- app/javascript/mastodon/actions/domain_blocks.js 1 addition, 0 deletionsapp/javascript/mastodon/actions/domain_blocks.js
- app/javascript/mastodon/actions/importer/normalizer.js 2 additions, 2 deletionsapp/javascript/mastodon/actions/importer/normalizer.js
- app/javascript/mastodon/actions/modal.js 2 additions, 1 deletionapp/javascript/mastodon/actions/modal.js
- app/javascript/mastodon/actions/notifications.js 4 additions, 4 deletionsapp/javascript/mastodon/actions/notifications.js
- app/javascript/mastodon/actions/search.js 3 additions, 2 deletionsapp/javascript/mastodon/actions/search.js
- app/javascript/mastodon/components/button.js 2 additions, 0 deletionsapp/javascript/mastodon/components/button.js
Loading
Please register or sign in to comment