Commit Graph

3150 Commits

Author SHA1 Message Date
246adab3e9 Merge remote-tracking branch 'refs/remotes/origin/sh-7573357' 2016-06-15 11:11:35 -07:00
39cb1fcdb6 spelling error 2016-06-15 10:49:28 -07:00
6aee34bce6 removed italics 2016-06-15 10:40:56 -07:00
82fb87d1df more Hello 2016-06-15 10:35:14 -07:00
275566cfe5 clear conflict 2016-06-15 10:33:43 -07:00
4f9bac7edc fixing typo 2016-06-15 09:37:21 -07:00
55cc3e55a9 add new topic to TOC 2016-06-15 09:29:16 -07:00
b4addce50c add topic and art for FQDN topic 2016-06-15 09:19:58 -07:00
ab9f6625b6 Merge remote-tracking branch 'refs/remotes/origin/master' into sh-7573357 2016-06-15 08:12:16 -07:00
694bae7256 + edu policy 2016-06-15 07:58:06 -07:00
067061d210 sync 2016-06-15 07:45:56 -07:00
3819131ee8 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-06-15 07:00:19 -07:00
de96bd3a8a Merge remote-tracking branch 'refs/remotes/origin/wsfb-7611326' 2016-06-15 06:59:51 -07:00
ada9b1e082 fixing typo 2016-06-15 06:43:08 -07:00
b38c864085 typo and adding link to managing with Intune topic 2016-06-15 06:39:39 -07:00
93f8a8ade1 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-15 06:32:16 -07:00
2b0ba382e3 Update change-history-for-keep-windows-10-secure.md
Added Windows Defender Advanced Threat Protection in May change history
2016-06-15 17:16:56 +10:00
5cc943e30d notes 2016-06-14 15:00:04 -07:00
1d8fa3c1d1 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdprov 2016-06-14 14:49:25 -07:00
8b779c11fc Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs 2016-06-14 14:48:15 -07:00
b2702c4151 script tweaks 2016-06-14 14:46:09 -07:00
60e055e185 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-14 12:51:10 -07:00
7eb1a30251 updated shell launcher script 2016-06-14 12:50:35 -07:00
7d1021484d Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-06-14 12:46:51 -07:00
ec8d30cb42 Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdngcrs 2016-06-14 10:38:48 -07:00
bc6cfd88b9 merge conflict 2016-06-14 10:38:02 -07:00
1482c6e6f7 Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
# Conflicts:
#	windows/deploy/update-windows-10-images-with-provisioning-packages.md
2016-06-14 10:36:41 -07:00
f1ef06a05a match table to edu 2016-06-14 10:33:58 -07:00
d01d59f8d5 Merge branch 'master' into live 2016-06-14 10:00:33 -07:00
ca0e3d57b7 Committing for merge 2016-06-14 09:59:06 -07:00
0df0ebc62e Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-14 08:39:05 -07:00
aba42e515c hopefully fix table whitespace 2016-06-14 08:28:19 -07:00
c985b3ac1c tweak table settings 2016-06-14 08:19:18 -07:00
1b6b32dbe1 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-14 07:44:01 -07:00
6ca7cd0518 remove br after table 2016-06-14 07:13:54 -07:00
e8006405e1 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-06-14 07:12:27 -07:00
656dae5cbe Merge remote-tracking branch 'refs/remotes/origin/vs-7825061' 2016-06-14 06:53:01 -07:00
10884be1c8 Merge remote-tracking branch 'refs/remotes/origin/vs-7610616' 2016-06-14 06:52:14 -07:00
7ba1bcbd93 fixing table missing heading from migration 2016-06-13 19:33:25 -07:00
174e429926 Merge remote-tracking branch 'refs/remotes/origin/master' into wsfb-7611326 2016-06-13 13:29:35 -07:00
bc3ebb7e5f Updated for new security topic 2016-06-13 12:46:58 -07:00
9623644ed3 Updated based on final feedback and sign off 2016-06-13 12:37:11 -07:00
49fdfb2e94 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7610616 2016-06-13 12:14:39 -07:00
cb706d59fb Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7825061 2016-06-13 12:10:02 -07:00
4b340638f0 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-7781347 2016-06-13 12:09:02 -07:00
91082c751d Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-06-13 12:04:20 -07:00
3d7b3501a1 Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox' 2016-06-13 12:04:11 -07:00
416d66f272 tweak account language 2016-06-13 12:03:38 -07:00
b6c1738a23 remove link to add take test app 2016-06-13 12:01:32 -07:00
33ea1494cd Merge remote-tracking branch 'refs/remotes/origin/jan-tagging-cleanup-windowsmobile' 2016-06-13 11:38:06 -07:00