Skip to content

Commit

Permalink
Merge branch 'master' into fix/max-import-export
Browse files Browse the repository at this point in the history
  • Loading branch information
kibanamachine authored Mar 11, 2021
2 parents 056f721 + 2c623bd commit e9c2b75
Show file tree
Hide file tree
Showing 984 changed files with 23,418 additions and 11,679 deletions.
1 change: 0 additions & 1 deletion .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -572,7 +572,6 @@ module.exports = {
{
files: [
'test/functional/services/lib/web_element_wrapper/scroll_into_view_if_necessary.js',
'src/legacy/ui/ui_render/bootstrap/kbn_bundles_loader_source.js',
'**/browser_exec_scripts/**/*.js',
],
rules: {
Expand Down
1 change: 1 addition & 0 deletions .stylelintrc
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ rules:
- return
- for
- at-root
- warn
comment-no-empty: true
no-duplicate-at-import-rules: true
no-duplicate-selectors: true
Expand Down
Loading

0 comments on commit e9c2b75

Please sign in to comment.