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

2020-05-13 22:11:49 +02:00
parent 559214c33f 92f85bea52
commit 3baacf6993
28 changed files with 695 additions and 813 deletions
--- a/app/views/directories/index.html.haml
+++ b/app/views/directories/index.html.haml
@ -25,7 +25,7 @@
        .directory__card__bar
          = link_to TagManager.instance.url_for(account), class: 'directory__card__bar__name' do
            .avatar
-              = image_tag account.avatar.url, alt: '', width: 48, height: 48, class: 'u-photo'
+              = image_tag account.avatar.url, alt: '', class: 'u-photo'

            .display-name
              %bdi