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

2018-05-29 13:52:26 +02:00
parent 8b98afa781 90908fc24b
commit c087738270
37 changed files with 553 additions and 93 deletions
--- a/.eslintrc.yml
+++ b/.eslintrc.yml
@ -7,6 +7,9 @@ env:
  es6: true
  jest: true

+globals:
+  ATTACHMENT_HOST: false
+
 parser: babel-eslint

 plugins: