Merge remote-tracking branch 'origin/atp-siem' into atp-siem

Browse Source

# Conflicts:

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping3.png

#	windows/threat-protection/windows-defender-atp/images/atp-siem-mapping4.png

...

This commit is contained in:

Joey Caparas 2017-05-26 13:30:30 -07:00

parent b472ee0beb 1575465fea

commit 2f6df02098

1 changed files with 0 additions and 0 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN

windows/threat-protection/windows-defender-atp/images/atp-siem-mapping2.png

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 99 KiB After Width:  |  Height:  |  Size: 100 KiB