jdeckerMS
|
2f0549e8d0
|
Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs
|
2016-07-27 12:56:35 -07:00 |
|
jdeckerMS
|
66c0c1044b
|
resolve merge conflicts
# Conflicts:
# education/windows/TOC.md
# education/windows/index.md
|
2016-07-27 12:43:27 -07:00 |
|
jdeckerMS
|
4654dbc411
|
need to switch branches
|
2016-07-27 12:41:47 -07:00 |
|
Dolcita
|
26dd2bc2fc
|
Added bug fix 7699825
|
2016-07-28 05:34:38 +10: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
|
993298b94f
|
fix typo
|
2016-07-27 11:43:08 -07:00 |
|
jdeckerMS
|
16f4e85978
|
tweak
|
2016-07-27 11:42:04 -07:00 |
|
Jan Backstrom
|
466b32d0ef
|
spacing
|
2016-07-27 11:04:38 -07:00 |
|
jdeckerMS
|
9fd2aaae47
|
fix typo
|
2016-07-27 11:01:46 -07:00 |
|
jdeckerMS
|
9f639bb9f0
|
Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs
|
2016-07-27 11:00:32 -07:00 |
|
jdeckerMS
|
a921f8ba94
|
reformat notes
|
2016-07-27 10:59:37 -07:00 |
|
Jan Backstrom
|
90c7dca608
|
tables
|
2016-07-27 10:50:40 -07:00 |
|
Brian Lich
|
91aaaeca88
|
Merge branch 'rs1' of https://github.com/Microsoft/win-cpub-itpro-docs into rs1
|
2016-07-27 10:48:56 -07:00 |
|
Brian Lich
|
bc318efeef
|
bug# 8291516
|
2016-07-27 10:48:44 -07:00 |
|
jdeckerMS
|
eb8d2df86f
|
fix link
|
2016-07-27 10:42:41 -07:00 |
|
jdeckerMS
|
c8909fa954
|
added Pro Edu back in
|
2016-07-27 10:40:58 -07:00 |
|
jdeckerMS
|
633d1018bc
|
add Celeste's topic to changelog
|
2016-07-27 10:32:19 -07:00 |
|
jdeckerMS
|
11adfbec34
|
Merge remote-tracking branch 'refs/remotes/origin/jdrs' into rs1
|
2016-07-27 09:57:46 -07:00 |
|
jdeckerMS
|
ad942170f0
|
repair link
# Conflicts:
# education/windows/index.md
|
2016-07-27 09:57:35 -07:00 |
|
LizRoss
|
f27140df84
|
Fixed broken link
|
2016-07-27 09:46:33 -07:00 |
|
jdeckerMS
|
c42b3f0809
|
Merge remote-tracking branch 'refs/remotes/origin/rs1' into jdrs
|
2016-07-27 09:44:13 -07:00 |
|
jdeckerMS
|
c39a99b712
|
Merge branch 'rs1' of https://github.com/Microsoft/win-cpub-itpro-docs into rs1
|
2016-07-27 09:42:20 -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 |
|
LizRoss
|
bf34cc3d7c
|
Merge remote-tracking branch 'refs/remotes/origin/vs-8283314' into rs1
|
2016-07-27 09:41:42 -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
|
62a43f6800
|
Merge remote-tracking branch 'refs/remotes/origin/master' into rs1
|
2016-07-27 09:40:05 -07:00 |
|
LizRoss
|
021c31b4af
|
Merged from master and fixed conflicts
|
2016-07-27 09:39:55 -07:00 |
|
LizRoss
|
dbb907087c
|
Merging from master and fixing conflicts
|
2016-07-27 09:36:31 -07:00 |
|
jdeckerMS
|
4a65b1573e
|
fix MSA
|
2016-07-27 09:35:21 -07:00 |
|
Jan Backstrom
|
3120a0e66b
|
fix table
|
2016-07-27 09:28:46 -07:00 |
|
jdeckerMS
|
8da009c07b
|
add link
|
2016-07-27 08:55:12 -07:00 |
|
jdeckerMS
|
1fc4086fde
|
clarify table
|
2016-07-27 08:50:08 -07:00 |
|
jdeckerMS
|
fb960c0ef7
|
Merge remote-tracking branch 'refs/remotes/origin/jd-sandbox'
|
2016-07-27 08:38:39 -07:00 |
|
jdeckerMS
|
5063f91a7b
|
sync
|
2016-07-27 08:24:33 -07:00 |
|
jdeckerMS
|
55ad41b421
|
fix links in edu
|
2016-07-27 08:20:31 -07:00 |
|
jdeckerMS
|
ad11ab6aff
|
fix changelog
|
2016-07-27 08:01:44 -07:00 |
|
jdeckerMS
|
5d7c352e8e
|
Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox
|
2016-07-27 07:53:09 -07:00 |
|
jdeckerMS
|
cb4091c607
|
new version
|
2016-07-27 07:52:35 -07:00 |
|
Jan Backstrom
|
0a7daa10f3
|
spacing
|
2016-07-26 23:10:17 -07:00 |
|
Jan Backstrom
|
3771eeb0b2
|
spacing
|
2016-07-26 21:44:31 -07:00 |
|
Jan Backstrom
|
8db399661a
|
spacing
|
2016-07-26 20:07:12 -07:00 |
|
Jan Backstrom
|
c66df99e99
|
spacing
|
2016-07-26 19:01:51 -07:00 |
|
Jan Backstrom
|
556b0cf7c7
|
fix spacing
|
2016-07-26 17:57:16 -07:00 |
|
Jan Backstrom
|
224da7fdb0
|
Merge remote-tracking branch 'refs/remotes/origin/master' into janb-winedu-deployschooldistrict
|
2016-07-26 17:48:19 -07:00 |
|
Greg Lindsay
|
56915eefee
|
minor change
|
2016-07-26 17:04:27 -07:00 |
|
Greg Lindsay
|
e8aad044b5
|
Merge branch 'vso-7442819'
|
2016-07-26 16:18:40 -07:00 |
|
Greg Lindsay
|
7b6eb46abe
|
some procedural fixes
|
2016-07-26 16:16:50 -07:00 |
|
jdeckerMS
|
6a912b9b0e
|
Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox
|
2016-07-26 14:09:21 -07:00 |
|
jdeckerMS
|
1cb53bf25d
|
fix
|
2016-07-26 14:08:49 -07:00 |
|
Jan Backstrom
|
6bdf4e91cf
|
Merge branch 'janb-winedu-deployschooldistrict' of https://github.com/Microsoft/win-cpub-itpro-docs into janb-winedu-deployschooldistrict
|
2016-07-26 14:03:32 -07:00 |
|