Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2017-12-02 14:17:11 +00:00
parent ad46bc9772 51f2eca887
commit 933eafdcd3
14 changed files with 102 additions and 25 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@@ -1,5 +1,3 @@
-@import 'variables';
-
 .app-body {
  -webkit-overflow-scrolling: touch;
  -ms-overflow-style: -ms-autohiding-scrollbar;