Merge remote-tracking branch 'origin/master' into gs-master

Conflicts: config/i18n-tasks.yml
2018-03-18 20:21:17 -05:00
parent 6a6f680d98 f02411da40
commit ab04be2f84
12 changed files with 51 additions and 9 deletions
--- a/app/javascript/styles/mastodon/components.scss
+++ b/app/javascript/styles/mastodon/components.scss
@ -1842,6 +1842,9 @@
    object-position: bottom left;
    width: 100%;
    height: 100%;
+    pointer-events: none;
+    user-drag: none;
+    user-select: none;
  }
 }