diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-01-24 14:37:06 +0100 |
| commit | 9adeaf2bfc1c16ca70e611b5288886b21414217b (patch) | |
| tree | 53372bc9bd6f38d158aad50c768e18773b7d3f3b /config/locales/no.yml | |
| parent | a8c109baca4d02cc8aed454e231518c1f8ec1844 (diff) | |
| parent | 4bae4e972d43f71bffb888ac82c180b2fa3f1ada (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system
Diffstat (limited to 'config/locales/no.yml')
| -rw-r--r-- | config/locales/no.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config/locales/no.yml b/config/locales/no.yml index 51d0eb1bd..12772f335 100644 --- a/config/locales/no.yml +++ b/config/locales/no.yml @@ -317,9 +317,6 @@ create: Legg til domene title: Ny blokkeringsoppføring av e-postdomene title: Blokkering av e-postdomene - followers: - back_to_account: Tilbake til kontoen - title: "%{acct} sine følgere" instances: by_domain: Domene delivery_available: Levering er tilgjengelig |