From: Michael Kaply <345868+mkaply@users.noreply.github.com>
Date: Fri, 17 Apr 2020 18:03:31 +0000 (-0500)
Subject: Merge branch 'master' of github.com:mozilla/policy-templates
X-Git-Tag: v1.16~5
X-Git-Url: https://git.p6c8.net/policy-templates.git/commitdiff_plain/9c7ddbf2eab95bf39eb43da21e67b52332b27c41?hp=e2e0df1127433c93841680d61847c3be233a8997

Merge branch 'master' of github.com:mozilla/policy-templates
---

diff --git a/README.md b/README.md
index 5791604..d143a3f 100644
--- a/README.md
+++ b/README.md
@@ -2408,7 +2408,7 @@ disabled
 | &nbsp;&nbsp;&nbsp;&nbsp;If set to Select Automatically, Firefox automatically chooses the default personal certificate.
 | security.mixed_content.block_active_content | boolean | Firefox 70, Firefox ESR 68.2 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, mixed active content (HTTP and HTTPS) is not blocked.
-| security.osclientcerts.autoload | boolean | Firefox 72, Firefox ESR 68.4 (Windows only) | false
+| security.osclientcerts.autoload | boolean | Firefox 72 (Windows), Firefox 75 (macOS)  | false
 | &nbsp;&nbsp;&nbsp;&nbsp;If true, client certificates are loaded from the operating system certificate store.
 | security.ssl.errorReporting.enabled | boolean | Firefox 68, Firefox ESR 68 | true
 | &nbsp;&nbsp;&nbsp;&nbsp;If false, SSL errors cannot be sent to Mozilla.