Merge remote-tracking branch 'upstream/master' into ml-apm-toggle-button

elastic · Oct 12, 2021 · b3c2ae9 · b3c2ae9
2 parents 258c926 + bc96e40
commit b3c2ae9
Show file tree

Hide file tree

Showing 309 changed files with 11,093 additions and 3,916 deletions.
diff --git a/api_docs/apm.json b/api_docs/apm.json
diff --git a/api_docs/apm.mdx b/api_docs/apm.mdx
@@ -10,7 +10,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 ---
 import apmObj from './apm.json';
 
-
+The user interface for Elastic APM
 
 Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
-Original file line number
+Diff line change
@@ Expand Up @@
     ---
     import apmObj from './apm.json';
+    The user interface for Elastic APM
     Contact [APM UI](https://github.com/orgs/elastic/teams/apm-ui) for questions regarding this plugin.
@@ Expand Down @@