Merge branch 'master' of github.com:elastic/kibana into fix/92055

# Conflicts: # api_docs/core.json # api_docs/core_http.json # api_docs/fleet.json
elastic · Mar 10, 2021 · ca6ffb8 · ca6ffb8
2 parents b30416b + 00fcc2d
commit ca6ffb8
Show file tree

Hide file tree

Showing 187 changed files with 25,855 additions and 25,835 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -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: {