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

2018-07-26 21:22:43 +02:00
parent 82ab5aacb2 3c35b34b61
commit 6141c2a035
72 changed files with 741 additions and 85 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -2011,6 +2011,7 @@ a.account__display-name {
  cursor: pointer;
  flex: 0 0 auto;
  font-size: 16px;
+  line-height: inherit;
  border: 0;
  text-align: unset;
  padding: 15px;