Skip to content

Commit

Permalink
Merge branch 'master' into security/reactify-account-screen
Browse files Browse the repository at this point in the history
  • Loading branch information
@legrego
legrego committed Apr 12, 2019
2 parents fa06efc + 80aae6b commit 670a28a
Show file tree
Hide file tree
Showing 1,694 changed files with 65,003 additions and 24,273 deletions.
4 changes: 4 additions & 0 deletions .eslintignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ node_modules
bower_components
/data
/build
/target
/.es
/plugins
/optimize
Expand Down Expand Up @@ -32,5 +33,8 @@ bower_components
/packages/kbn-interpreter/src/common/lib/grammar.js
/x-pack/plugins/canvas/canvas_plugin
/x-pack/plugins/canvas/canvas_plugin_src/lib/flot-charts
/x-pack/plugins/infra/common/graphql/types.ts
/x-pack/plugins/infra/public/graphql/types.ts
/x-pack/plugins/infra/server/graphql/types.ts
**/*.js.snap
!/.eslintrc.js
Loading

0 comments on commit 670a28a

Please sign in to comment.