8159 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
LizRoss	cf5bafb51a	Fixing formatting	2017-03-28 11:16:26 -07:00
LizRoss	31c62d89b8	Fixing formatting	2017-03-28 11:01:08 -07:00
LizRoss	20e3ff15ee	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-28 10:31:14 -07:00
LizRoss	e0f58566e1	Fixing formatting	2017-03-28 10:31:10 -07:00
Joey Caparas	4739eb9efd	Merge remote-tracking branch 'refs/remotes/origin/atp-fixes'	2017-03-28 10:22:48 -07:00
Joey Caparas	ab57775114	Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes	2017-03-28 10:22:02 -07:00
LizRoss	1e22a8970b	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-28 10:15:45 -07:00
Justin Hall	d4d257765d	Merge pull request #487 from Justinha/ChangeHistory ... fixed typo	2017-03-27 16:44:29 -07:00
Justinha	065930ab0c	fixed typo	2017-03-27 16:43:19 -07:00
Justin Hall	39f94d2620	Merge pull request #486 from Justinha/VSTS11415120 ... added GP setting name to countermeasures topic	2017-03-27 16:19:14 -07:00
Justinha	775483c9c6	added GP setting name to countermeasures topic	2017-03-27 16:15:45 -07:00
LizRoss	ec61cd8ef6	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-27 11:54:36 -07:00
Joey Caparas	93fc261a00	fix code block	2017-03-27 11:46:55 -07:00
Joey Caparas	3ea061bb00	Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes	2017-03-27 11:45:33 -07:00
LizRoss	63b8be7fa0	Fixed conflict	2017-03-27 11:20:32 -07:00
Joey Caparas	cea8c10d98	Merge remote-tracking branch 'refs/remotes/origin/atp-27Mar'	2017-03-27 11:18:50 -07:00
Joey Caparas	3cb930b965	add topic to table	2017-03-27 11:16:24 -07:00
Joey Caparas	59374c28d3	update windows defender disabled by policy section	2017-03-27 10:59:20 -07:00
Joey Caparas	77fce7d914	Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes	2017-03-27 10:47:53 -07:00
Justin Hall	98669a739b	Merge pull request #479 from Justinha/ChangeHistory ... updated 2017 references	2017-03-27 09:47:05 -07:00
Justinha	38e355cf76	updated 2017 references	2017-03-27 09:46:04 -07:00
LizRoss	1a8e5a9406	fixing sync issue	2017-03-27 09:10:25 -07:00
LizRoss	6d5d414c97	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-27 06:50:28 -07:00
Dani Halfin	eb62e8acba	Merge remote-tracking branch 'refs/remotes/origin/dh-waas-wufb-11139756'	2017-03-24 15:35:07 -07:00
Dani Halfin	8d7b928e87	waas-wufb changes to update compliance	2017-03-24 15:25:24 -07:00
Dani Halfin	f8004294eb	Merge remote-tracking branch 'refs/remotes/origin/master' into dh-waas-wufb-11139756	2017-03-24 15:13:52 -07:00
Elizabeth Ross	844d3597a8	Merge pull request #147 from exchange12rocks/patch-1 ... Corrects #137	2017-03-24 14:52:59 -07:00
LizRoss	d41dd47ab8	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-24 14:16:38 -07:00
Kirill Nikolaev	12ac27caed	Corrects #137	2017-03-24 23:04:57 +03:00
Elizabeth Ross	ac41f9ff8f	Merge pull request #145 from exchange12rocks/patch-1 ... Corrects default notification values	2017-03-24 12:44:40 -07:00
Elizabeth Ross	392bb6721c	Merge pull request #146 from heatherpoulsen/patch-2 ... Update upgrade-readiness-get-started.md	2017-03-24 12:40:04 -07:00
LizRoss	163b8cff02	Merge remote-tracking branch 'refs/remotes/origin/master' into vs-wiprs2	2017-03-24 11:14:01 -07:00
Joey Caparas	8d8afb52ce	Merge remote-tracking branch 'refs/remotes/origin/atp-fixes'	2017-03-23 17:23:45 -07:00
Joey Caparas	426357c3e2	revert	2017-03-23 17:22:30 -07:00
Joey Caparas	719b462d94	update note style	2017-03-23 17:18:34 -07:00
Joey Caparas	701e1c3838	Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes	2017-03-23 17:17:17 -07:00
Justin Hall	a05c888946	Merge pull request #469 from Microsoft/revert-461-v-jotob ... Revert "V jotob"	2017-03-23 16:59:47 -07:00
Justin Hall	0175321036	Revert "V jotob"	2017-03-23 16:58:02 -07:00
Justin Hall	be87bf3894	Merge pull request #461 from Microsoft/v-jotob ... V jotob	2017-03-23 16:57:55 -07:00
Joey Caparas	8e1af94b56	Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes	2017-03-23 16:28:42 -07:00
H. Poulsen	f442663dab	Update upgrade-readiness-get-started.md ... Correcting the first step for customers not currently using OMS.	2017-03-23 15:52:30 -07:00
Greg Lindsay	0ecc76ec49	Merge branch 'vso-7772516'	2017-03-23 15:49:25 -07:00
Greg Lindsay	0f53fef51c	added link	2017-03-23 15:48:55 -07:00
Greg Lindsay	ebc9814b13	Merge branch 'vso-7772516'	2017-03-23 15:43:33 -07:00
Greg Lindsay	d78a90d541	s	2017-03-23 15:43:03 -07:00
Greg Lindsay	ea89e29b7e	Merge branch 'vso-7772516'	2017-03-23 15:31:09 -07:00
Greg Lindsay	9f522b5e3d	s	2017-03-23 15:30:30 -07:00
Greg Lindsay	174cb780cf	switched topic order	2017-03-23 15:27:45 -07:00
Greg Lindsay	5768a54455	Merge branch 'vso-7772516'	2017-03-23 15:23:00 -07:00
Greg Lindsay	7214ffd98f	added enterprise upgrade	2017-03-23 15:22:29 -07:00