diff options
| author | Henry Jameson <me@hjkos.com> | 2020-12-16 18:43:38 +0200 |
|---|---|---|
| committer | Henry Jameson <me@hjkos.com> | 2020-12-16 18:43:38 +0200 |
| commit | 0cf06cb9ec2136630d5a2a183f48aa7975a14a71 (patch) | |
| tree | d8ee5d3c8710e57acf6ff1384d90e71161a95295 /src/components/features_panel/features_panel.vue | |
| parent | 81bac9f8ac094df9a71a9c4f4427f11655362537 (diff) | |
| parent | 34c65e3bcf12c0f114ad657d8a67825a3b74388a (diff) | |
Merge remote-tracking branch 'origin/develop' into plain-bg
* origin/develop:
fix remote follow button style
Disable horizontal textarea resize
Add uk.json in messages.js
Display upload limit on the Features panel
use title html for poll options before vote
fix recent mistakes in react button
Diffstat (limited to 'src/components/features_panel/features_panel.vue')
| -rw-r--r-- | src/components/features_panel/features_panel.vue | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/components/features_panel/features_panel.vue b/src/components/features_panel/features_panel.vue index 608b11c8..9605d09d 100644 --- a/src/components/features_panel/features_panel.vue +++ b/src/components/features_panel/features_panel.vue @@ -25,6 +25,7 @@ </li> <li>{{ $t('features_panel.scope_options') }}</li> <li>{{ $t('features_panel.text_limit') }} = {{ textlimit }}</li> + <li>{{ $t('features_panel.upload_limit') }} = {{ uploadlimit.num }} {{ $t('upload.file_size_units.' + uploadlimit.unit) }}</li> </ul> </div> </div> |