Merge branch 'master' into apply-function-ui-fix

pull/676/head
Alex P 2016-12-09 13:52:40 -08:00
commit 86a3eb3ca8
1 changed files with 1 additions and 1 deletions

2
.gitignore vendored
View File

@ -4,7 +4,7 @@ canned/apps_gen.go
server/swagger_gen.go
.pull-request
node_modules
chronograf
/chronograf
node_modules/
build/
chronograf.db