deepblue/windows-itpro-docs
1
0
Fork 0
mirror of https://github.com/MicrosoftDocs/windows-itpro-docs.git synced 2025-05-17 15:57:23 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity
9,750 Commits 15 Branches 0 Tags
Commit Graph

9750 Commits

This Branch
This Branch
All Branches
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
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
LizRoss
12d7c1ba7b Updated important note with newer version number 2016-07-27 12:18:09 -07:00
LizRoss
78b523bd0b Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-27 12:15:46 -07:00
LizRoss
bf692ce86c Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-07-27 12:15:14 -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
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
LizRoss
4bfb1a9e46 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-27 10:51:21 -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
Brian Lich
7e3ac4d246 Merge pull request #82 from JanKeller1/6641851a 
Replaced old diagram, removed relnotes file that wont be used
 2016-07-27 10:12:08 -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
LizRoss
44f94289d7 Updated the important note so it doesn't have to be changed with each version 2016-07-27 09:32:10 -07:00
Jan Backstrom
3120a0e66b fix table 2016-07-27 09:28:46 -07:00
LizRoss
64ea2d8ea5 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-8094158 2016-07-27 09:14:38 -07:00
LizRoss
3ae1a2ed9d Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-07-27 09:13:03 -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
6db38a19de fix typo 2016-07-27 08:28:32 -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
Joey Caparas
5a92db6171 update table to fix numbering 2016-07-27 19:34:12 +10:00
Joey Caparas
96b2f8f213 fix formatting 2016-07-27 18:50:41 +10:00
Jan Backstrom
0a7daa10f3 spacing 2016-07-26 23:10:17 -07:00
Joey Caparas
e4f64e0ed7 update In this section to add new topics 2016-07-27 15:45:05 +10:00