about summary refs log tree commit diff
path: root/config/locales/no.yml
diff options
context:
space:
mode:
authorDavid Yip <yipdw@member.fsf.org>2018-01-19 15:22:10 -0600
committerDavid Yip <yipdw@member.fsf.org>2018-01-19 15:22:10 -0600
commit2ca965c704075467226dbf798e13ac8e0e62cc15 (patch)
treec437e1f4993a6337759eb09157c78cd8134fd774 /config/locales/no.yml
parent2b2de41bc7ecec15aa73650da153e50f0e16f16b (diff)
parent0b888acfd4ffddd29f25c878373e9b9f5ec6c0ab (diff)
Merge remote-tracking branch 'origin/master' into merge-upstream
 Conflicts:
	app/javascript/styles/mastodon/components.scss
	app/javascript/styles/mastodon/modal.scss
Diffstat (limited to 'config/locales/no.yml')
-rw-r--r--config/locales/no.yml1
1 files changed, 0 insertions, 1 deletions
diff --git a/config/locales/no.yml b/config/locales/no.yml
index 57f8547fc..3b212932e 100644
--- a/config/locales/no.yml
+++ b/config/locales/no.yml
@@ -163,7 +163,6 @@
     title: Administrasjon
   application_mailer:
     settings: 'Endre foretrukne e-postinnstillinger: %{link}'
-    signature: Mastodon-notiser fra %{instance}
     view: 'Se:'
   applications:
     invalid_url: Den oppgitte URLen er ugyldig