jdeckerMS 618531377e Merge remote-tracking branch 'refs/remotes/origin/master' into rs1 ...

# Conflicts:
#	education/windows/TOC.md
#	education/windows/change-history-edu.md
#	education/windows/index.md
#	windows/manage/TOC.md

2016-07-27 09:40:35 -07:00

..

deploy

Merge remote-tracking branch 'refs/remotes/origin/master' into rs1

2016-07-27 09:40:35 -07:00

keep-secure

Update screenshot with preferred selections

2016-07-26 12:42:39 -07:00

manage

Merge remote-tracking branch 'refs/remotes/origin/master' into rs1

2016-07-27 09:40:35 -07:00

plan

Fixing issues

2016-07-26 10:33:30 -07:00

whats-new

Moving old what's new content into the product library

2016-07-26 11:17:01 -07:00

docfx.json

Removed extra comma

2016-04-04 11:52:02 -07:00

index.md

changing from ms.prod: W10 to ms.prod: w10

2016-06-02 15:42:37 -07:00

TOC.md

adding some placeholder content

2016-03-06 19:16:51 -08:00

yw45mjxz.3sx.json

new test conversion biuld

2016-04-07 10:18:36 -07:00