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

2019-02-19 20:18:40 +01:00
parent 896beb16c5 8e7fc7ec73
commit ff0576cc2b
15 changed files with 120 additions and 41 deletions
--- a/app/javascript/mastodon/features/video/index.js
+++ b/app/javascript/mastodon/features/video/index.js
@@ -347,7 +347,6 @@ class Video extends React.PureComponent {
      width  = containerWidth;
      height = containerWidth / (16/9);

-      playerStyle.width  = width;
      playerStyle.height = height;
    }