Merge remote-tracking branch 'upstream/master'
Showing
- app/controllers/api/v1/announcements_controller.rb 1 addition, 5 deletionsapp/controllers/api/v1/announcements_controller.rb
- app/controllers/concerns/signature_verification.rb 2 additions, 0 deletionsapp/controllers/concerns/signature_verification.rb
- app/helpers/accounts_helper.rb 1 addition, 1 deletionapp/helpers/accounts_helper.rb
- app/javascript/mastodon/actions/announcements.js 30 additions, 0 deletionsapp/javascript/mastodon/actions/announcements.js
- app/javascript/mastodon/features/getting_started/components/announcements.js 33 additions, 1 deletion...odon/features/getting_started/components/announcements.js
- app/javascript/mastodon/features/getting_started/containers/announcements_container.js 2 additions, 1 deletion...res/getting_started/containers/announcements_container.js
- app/javascript/mastodon/features/home_timeline/index.js 1 addition, 1 deletionapp/javascript/mastodon/features/home_timeline/index.js
- app/javascript/mastodon/features/video/index.js 1 addition, 1 deletionapp/javascript/mastodon/features/video/index.js
- app/javascript/mastodon/locales/ar.json 7 additions, 4 deletionsapp/javascript/mastodon/locales/ar.json
- app/javascript/mastodon/locales/ast.json 51 additions, 48 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 3 additions, 0 deletionsapp/javascript/mastodon/locales/co.json
- app/javascript/mastodon/locales/cs.json 4 additions, 1 deletionapp/javascript/mastodon/locales/cs.json
- app/javascript/mastodon/locales/cy.json 4 additions, 1 deletionapp/javascript/mastodon/locales/cy.json
- app/javascript/mastodon/locales/da.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/da.json
- app/javascript/mastodon/locales/de.json 4 additions, 1 deletionapp/javascript/mastodon/locales/de.json
- app/javascript/mastodon/locales/el.json 3 additions, 0 deletionsapp/javascript/mastodon/locales/el.json
Loading
Please register or sign in to comment