76 Commits

Author	SHA1	Message	Date
jdeckerMS	66c0c1044b	resolve merge conflicts ... # Conflicts: # education/windows/TOC.md # education/windows/index.md	2016-07-27 12:43:27 -07:00
Jan Backstrom	7f01a8877d	Merge remote-tracking branch 'refs/remotes/origin/janb-winedu-deployschooldistrict' ... # Conflicts: # education/windows/change-history-edu.md	2016-07-27 12:06:51 -07:00
jdeckerMS	4c6e88944c	Merge remote-tracking branch 'origin/rs1' into rs1 ... # Conflicts: # education/windows/TOC.md # education/windows/change-history-edu.md # education/windows/index.md	2016-07-27 09:42:09 -07:00
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
LizRoss	021c31b4af	Merged from master and fixed conflicts	2016-07-27 09:39:55 -07:00
jdeckerMS	cb4091c607	new version	2016-07-27 07:52:35 -07:00
Celeste de Guzman	798e86f72e	Updated index.md to include link and description for deployment recommendations article	2016-07-25 15:51:55 -07:00
Jan Backstrom	b201a26b59	Add to TOC, Index, Change History	2016-07-22 18:03:23 -07:00
jdeckerMS	f0231f34b3	remove "preview" tag from topics	2016-07-12 09:22:56 -07:00
jdeckerMS	ec670a10dc	add minecraft to parent topic	2016-06-10 13:24:54 -07:00
Jan Backstrom	b67e919b15	fix tagging ... change W10 to w10. add ms.pagetype of edu	2016-06-07 12:00:17 -07:00
jdeckerMS	e37cd8e0ea	tweak link text	2016-06-01 09:33:19 -07:00
jdeckerMS	41eb775b23	tweak h1s	2016-05-26 09:16:31 -07:00
jdeckerMS	14c33eb654	add steps to apply task	2016-05-26 08:22:28 -07:00
jdeckerMS	3de247f4c1	add link to Heather's page	2016-05-25 09:27:24 -07:00
jdeckerMS	a0f6d4e8b7	prep for initial publication	2016-05-25 09:06:59 -07:00
jdeckerMS	f9a7ca405a	troubleshooting	2016-05-19 09:27:09 -07:00
jdeckerMS	e217169341	adding minecraft	2016-05-19 08:51:16 -07:00
jdeckerMS	4dc10a879f	new topic staged	2016-05-17 07:03:50 -07:00
jdeckerMS	d79f30b6b2	added new topic to toc/index	2016-05-13 10:23:42 -07:00
jdeckerMS	71aebac2d8	add video, new topic	2016-05-12 12:26:33 -07:00
jdeckerMS	1242eb8e17	add topic, delete video test	2016-05-12 08:22:36 -07:00
jdeckerMS	62e5d530fd	tweaks	2016-05-12 08:12:33 -07:00
jdeckerMS	43083f00e7	copied 2 edu topics from win10	2016-05-12 07:37:13 -07:00
jdeckerMS	04bf9dff0a	fixed link	2016-05-12 06:58:36 -07:00
jdeckerMS	b0ab633a64	added folder duh	2016-05-11 13:54:32 -07:00