diff options
author | David Yip <yipdw@member.fsf.org> | 2017-10-16 15:46:12 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-16 15:46:12 -0500 |
commit | 7c44ad63550ccf3cb7532440f79196b20dc24c5d (patch) | |
tree | fb5d8ed08dc130607fd7fd31c67b7cad4ebfd8f5 /spec/javascript/.eslintrc.yml | |
parent | 6cd5b3bbe5a11fcf25bbefba2803f2ae840f39fc (diff) | |
parent | 37ff061d9bf0a91da6580960be01e3c6bc5e5c4c (diff) |
Merge pull request #181 from glitch-soc/upstream-merge-again
Merge upstream, pull in fixes for tootsuite/mastodon#{5409,5417}
Diffstat (limited to 'spec/javascript/.eslintrc.yml')
-rw-r--r-- | spec/javascript/.eslintrc.yml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/spec/javascript/.eslintrc.yml b/spec/javascript/.eslintrc.yml deleted file mode 100644 index 6db2a46c5..000000000 --- a/spec/javascript/.eslintrc.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -env: - mocha: true |