summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2015-09-03 13:39:22 -0700
committer=Corey Hulen <corey@hulen.com>2015-09-03 13:39:22 -0700
commit05d95d80a896d14474c7f7384d67b9edd524b922 (patch)
tree2fcc619c38175014813ffc7df34abad82e5d5b77 /Makefile
parent48ca3a4007c8b9c40a3bc3789563ed9992e9b64d (diff)
parent4f0c06114b61c92d982baac1c54ed80da93a9cc9 (diff)
downloadchat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.gz
chat-05d95d80a896d14474c7f7384d67b9edd524b922.tar.bz2
chat-05d95d80a896d14474c7f7384d67b9edd524b922.zip
Merge branch 'master' into PLT-12
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index d8250c07f..305926e5b 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ travis:
@cd web/react/ && npm install
@echo Checking for style guide compliance
- cd web/react && $(ESLINT) components/* dispatcher/* pages/* stores/* utils/*
+ cd web/react && $(ESLINT) --quiet components/* dispatcher/* pages/* stores/* utils/*
@$(GO) build $(GOFLAGS) ./...
@$(GO) install $(GOFLAGS) -a ./...