Merge branch 'develop' into feature/apple-container-clear

MarathonLabs · Sep 17, 2023 · d41b9b0 · d41b9b0
2 parents 6589cb6 + 6a2530d
commit d41b9b0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 3 deletions.
diff --git a/ADOPTERS.md b/ADOPTERS.md
@@ -15,3 +15,4 @@ can [add it in a PR!](https://github.com/MarathonLabs/marathon/edit/develop/ADOP
 * [DM-TECH](https://dmtech.team)
 * [Aetna](https://www.aetna.com) 
 * [CVS Health](https://www.cvshealth.com)
+* [PITS Global Data Recovery Services](https://www.pitsdatarecovery.net/)
diff --git a/docs/docs/android/configure.md b/docs/docs/android/configure.md
@@ -595,7 +595,6 @@ With the introduction of [adam][4] we can precisely control the timeout of indiv
 ```yaml
 vendorConfiguration:
   type: "Android"
-  vendor: ADAM
   timeoutConfiguration:
     # ISO_8601 duration
     shell: "PT30S"

diff --git a/docs/versioned_docs/version-0.8.0/android/configure.md b/docs/versioned_docs/version-0.8.0/android/configure.md
@@ -595,7 +595,6 @@ With the introduction of [adam][4] we can precisely control the timeout of indiv
 ```yaml
 vendorConfiguration:
   type: "Android"
-  vendor: ADAM
   timeoutConfiguration:
     # ISO_8601 duration
     shell: "PT30S"

diff --git a/docs/versioned_docs/version-0.8.4/android/configure.md b/docs/versioned_docs/version-0.8.4/android/configure.md
@@ -595,7 +595,6 @@ With the introduction of [adam][4] we can precisely control the timeout of indiv
 ```yaml
 vendorConfiguration:
   type: "Android"
-  vendor: ADAM
   timeoutConfiguration:
     # ISO_8601 duration
     shell: "PT30S"