Fixing conflicts

This commit is contained in:
LizRoss
2017-01-03 10:28:23 -08:00
2 changed files with 9 additions and 1 deletions

View File

@ -12,12 +12,17 @@ author: brianlic-msft
# Change history for Keep Windows 10 secure
This topic lists new and updated topics in the [Keep Windows 10 secure](index.md) documentation for [Windows 10 and Windows 10 Mobile](../index.md).
## December 2016
## January 2017
|New or changed topic |Description |
|---------------------|------------|
|[Recommended Office 365 Mail and Calendar apps configuration with Windows Information Protection (WIP)](recommended-office-365-configurations-for-wip.md) |New |
|[Recommended Enterprise Cloud Resources and Neutral Resources network settings with Windows Information Protection (WIP)](recommended-network-definitions-for-wip.md) |New |
## December 2016
|New or changed topic |Description |
|---------------------|------------|
|[Create WMI Filters for the GPO](create-wmi-filters-for-the-gpo.md) |Added filter examples for Windows 10 and Windows Server 2016. |
## November 2016
| New or changed topic | Description |