Merge remote-tracking branch 'upstream/master'
No related branches found
No related tags found
Showing
- CHANGELOG.md 12 additions, 4 deletionsCHANGELOG.md
- Gemfile 1 addition, 1 deletionGemfile
- Gemfile.lock 2 additions, 2 deletionsGemfile.lock
- app/controllers/api/web/embeds_controller.rb 11 additions, 5 deletionsapp/controllers/api/web/embeds_controller.rb
- app/controllers/tags_controller.rb 7 additions, 3 deletionsapp/controllers/tags_controller.rb
- app/javascript/mastodon/components/status_action_bar.js 1 addition, 1 deletionapp/javascript/mastodon/components/status_action_bar.js
- app/javascript/mastodon/features/status/components/action_bar.js 2 additions, 4 deletions...ascript/mastodon/features/status/components/action_bar.js
- app/javascript/mastodon/locales/ar.json 3 additions, 3 deletionsapp/javascript/mastodon/locales/ar.json
- app/javascript/mastodon/locales/ast.json 29 additions, 29 deletionsapp/javascript/mastodon/locales/ast.json
- app/javascript/mastodon/locales/ca.json 2 additions, 2 deletionsapp/javascript/mastodon/locales/ca.json
- app/javascript/mastodon/locales/cy.json 3 additions, 3 deletionsapp/javascript/mastodon/locales/cy.json
- app/javascript/mastodon/locales/gl.json 12 additions, 12 deletionsapp/javascript/mastodon/locales/gl.json
- app/javascript/mastodon/locales/id.json 1 addition, 1 deletionapp/javascript/mastodon/locales/id.json
- app/javascript/mastodon/locales/kab.json 9 additions, 9 deletionsapp/javascript/mastodon/locales/kab.json
- app/javascript/mastodon/locales/pl.json 9 additions, 9 deletionsapp/javascript/mastodon/locales/pl.json
- app/javascript/mastodon/locales/sk.json 3 additions, 3 deletionsapp/javascript/mastodon/locales/sk.json
- app/javascript/mastodon/locales/ta.json 51 additions, 51 deletionsapp/javascript/mastodon/locales/ta.json
- app/javascript/styles/mastodon/components.scss 3 additions, 4 deletionsapp/javascript/styles/mastodon/components.scss
- app/lib/formatter.rb 2 additions, 0 deletionsapp/lib/formatter.rb
- app/lib/sanitize_config.rb 39 additions, 6 deletionsapp/lib/sanitize_config.rb
Loading
Please register or sign in to comment