diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2020-03-27 21:54:44 +0100 |
| commit | 7b435fd9bf81265241fab792d8e8e0c2f4f1b619 (patch) | |
| tree | ef366f436ed5180489cc9377268e10328fe9a932 /config/locales/mk.yml | |
| parent | 02f1c04fabab221130de8dfb5611be81825b193b (diff) | |
| parent | 6c79b7237e31eb510af7df3f4f2cb133dea39845 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - `app/services/post_status_service.rb`: CW/sensitive logic fixed upstream, but different in glitch-soc. Ported the changes accordingly.
Diffstat (limited to 'config/locales/mk.yml')
| -rw-r--r-- | config/locales/mk.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/locales/mk.yml b/config/locales/mk.yml index acb18fb5a..c2cafa5a7 100644 --- a/config/locales/mk.yml +++ b/config/locales/mk.yml @@ -7,7 +7,7 @@ mk: '406': This page is not available in the requested format. '410': The page you were looking for doesn't exist here anymore. '422': - '429': Throttled + '429': Too many requests '500': '503': The page could not be served due to a temporary server failure. invites: |