Paolo Matarazzo c97fbd8ea8 resolved conflicts

2023-05-24 16:42:58 -04:00

..

auditing

(Windows 10)

2023-05-24 11:44:39 -04:00

device-guard

Add notes for how to gray out/activate the memory integrity UI

2023-04-18 13:49:09 -07:00

images

restore pics

2023-03-29 07:46:00 -04:00

microsoft-defender-application-guard

update

2023-05-24 12:24:58 -04:00

microsoft-defender-smartscreen

Update phishing-protection-microsoft-defender-smartscreen.md

2023-05-16 17:41:32 -04:00

security-policy-settings

(Windows 10)

2023-05-24 11:44:39 -04:00

windows-defender-application-control

Removed (Windows) from the tiles across all articles in the security docset

2023-05-24 10:34:49 -04:00

windows-defender-security-center

updates

2023-02-21 16:28:31 -05:00

windows-defender-system-guard

(Windows 10)

2023-05-24 11:44:39 -04:00

windows-sandbox

added licensing info

2023-05-01 11:59:40 -04:00

windows-security-configuration-framework

updates

2023-05-02 16:01:55 -04:00

block-untrusted-fonts-in-enterprise.md

(Windows 10)

2023-05-24 11:44:39 -04:00

fips-140-validation.md

Fix typo

2023-04-21 08:07:15 +02:00

index.md

metadata updates

2023-03-09 14:38:09 -05:00

mbsa-removal-and-guidance.md

Update windows/security/threat-protection/mbsa-removal-and-guidance.md

2023-03-29 11:08:20 -05:00

msft-security-dev-lifecycle.md

metadata updates

2023-03-09 14:38:09 -05:00

override-mitigation-options-for-app-related-security-policies.md

(Windows 10)

2023-05-24 11:44:39 -04:00

overview-of-threat-mitigations-in-windows-10.md

(Windows 10)

2023-05-24 11:44:39 -04:00

protect-high-value-assets-by-controlling-the-health-of-windows-10-based-devices.md

updated relative links

2023-05-23 07:39:57 -04:00

use-windows-event-forwarding-to-assist-in-intrusion-detection.md

(Windows 10)

2023-05-24 11:44:39 -04:00

windows-platform-common-criteria.md

updated tiering info

2023-02-16 14:04:51 -05:00