diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2021-07-11 21:41:23 +0200 |
| commit | cdf20f4367226bc5682a0b040fa62f56d6f58fb5 (patch) | |
| tree | 630fca746dc138284eb7402c878f212578ebd74c /config/locales | |
| parent | f040b9aee3f84cb3ba8926fed81d47df3f1094a7 (diff) | |
| parent | a2ce7508c95f473a77d46a99fc1e090c0defadcc (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/serializers/rest/instance_serializer.rb`: Upstream changed the fields returned by /api/v1/instance by adding a `configuration` field holding a lot of useful information making our `max_toot_chars` and `poll_limits` fields obsolete. Keeping those around for now for compatibility. - `app/validators/status_length_validator.rb`: No real conflict, just URL_PLACEHOLDER_CHARS introduced too close to MAX_CHARS which is defined differently in glitch-soc. Ported upstream changes.
Diffstat (limited to 'config/locales')
| -rw-r--r-- | config/locales/en.yml | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/config/locales/en.yml b/config/locales/en.yml index 51764a0e1..af7266d86 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -579,6 +579,7 @@ en: resolved: Resolved resolved_msg: Report successfully resolved! status: Status + target_origin: Origin of reported account title: Reports unassign: Unassign unresolved: Unresolved |