Merge branch 'master' into glitch-soc/merge-upstream

Conflicts:
- `README.md`:
  We have a different README than upstream, discarded upstream changes
  and kept ours.

app/views/layouts/public.html.haml

@@ -38,7 +38,7 @@
             %h4= t 'footer.developers'
             %ul
               %li= link_to t('about.documentation'), 'https://docs.joinmastodon.org/'
-              %li= link_to t('about.api'), 'https://docs.joinmastodon.org/api/guidelines/'
+              %li= link_to t('about.api'), 'https://docs.joinmastodon.org/client/intro/'
           .column-2
             %h4= link_to t('about.what_is_mastodon'), 'https://joinmastodon.org/'
             = link_to svg_logo, root_url, class: 'brand'

app/views/statuses/_poll.html.haml

@@ -12,14 +12,16 @@
             %span.poll__number><
               - if own_votes.include?(index)
                 %i.poll__voted__mark.fa.fa-check
-              = percent.round
-            = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+              = "#{percent.round}%"
+            %span.poll__option__text
+              = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
 
-            %span.poll__chart{ style: "width: #{percent}%" }
+          %span.poll__chart{ style: "width: #{percent}%" }
         - else
           %label.poll__option><
             %span.poll__input{ class: poll.multiple? ? 'checkbox' : nil}><
-            = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
+            %span.poll__option__text
+              = Formatter.instance.format_poll_option(status, option, autoplay: autoplay)
   .poll__footer
     - unless show_results
       %button.button.button-secondary{ disabled: true }