Merge branch 'develop' into 'tusooa/save-draft'

# Conflicts:
#   src/boot/routes.js
#   src/i18n/en.json
#   src/main.js
#   src/modules/config.js
#   src/modules/instance.js

src/components/poll/poll.vue

@@ -76,6 +76,13 @@
       >
         {{ $t('polls.vote') }}
       </button>
+      <span
+        v-if="poll.pleroma?.non_anonymous"
+        :title="$t('polls.non_anonymous_title')"
+      >
+        {{ $t('polls.non_anonymous') }}
+        &nbsp;·&nbsp;
+      </span>
       <div class="total">
         <template v-if="typeof poll.voters_count === 'number'">
           {{ $tc("polls.people_voted_count", poll.voters_count, { count: poll.voters_count }) }}