Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: app/javascript/styles/mastodon/components.scss app/javascript/styles/mastodon/modal.scss
2018-01-19 15:22:10 -06:00
parent 2b2de41bc7 0b888acfd4
commit 2ca965c704
90 changed files with 375 additions and 496 deletions
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@ -340,7 +340,6 @@ pt-BR:
  application_mailer:
    salutation: "%{name},"
    settings: 'Mudar e-mail de preferência: %{link}'
-    signature: Notificações do Mastodon de %{instance}
    view: 'Visualizar:'
  applications:
    created: Aplicação criada com sucesso