9855 Commits

Author SHA1 Message Date
Dani Halfin
96c87efa20 Merge remote-tracking branch 'refs/remotes/origin/master' into dh-servicing-sandbox 2017-04-18 10:25:58 -07:00
LizRoss
2354536b09 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2017-04-17 17:15:50 -07:00
Elizabeth Ross
b24171190e Merge pull request #165 from Microsoft/eross-msft-patch-3
Updated version
2017-04-17 17:09:55 -07:00
Elizabeth Ross
d4cdb1f3d6 Updated version 2017-04-17 17:09:38 -07:00
Elizabeth Ross
433e4b138f Merge pull request #164 from Microsoft/eross-msft-patch-2
Updated version
2017-04-17 17:08:27 -07:00
Elizabeth Ross
2a4f7da2e0 Updated version 2017-04-17 17:08:07 -07:00
Elizabeth Ross
a5cc645956 Merge pull request #163 from Microsoft/eross-msft-patch-1
Updated versions
2017-04-17 17:07:17 -07:00
Elizabeth Ross
5446b71e78 Updated versions 2017-04-17 17:06:34 -07:00
Elizabeth Ross
a286be09d4 Merge pull request #623 from Microsoft/atp-ibiza-intune
Atp ibiza intune
2017-04-17 16:22:48 -07:00
Elizabeth Ross
55898893d2 Merge pull request #624 from Microsoft/atp-fixes
Atp fixes
2017-04-17 16:22:19 -07:00
LizRoss
852bded662 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-intunechanges 2017-04-17 12:41:08 -07:00
LizRoss
f1aa50ffe1 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-uatfixes 2017-04-17 12:38:20 -07:00
Joey Caparas
8b184a299e Merge remote-tracking branch 'refs/remotes/origin/master' into atp-fixes 2017-04-17 10:49:17 -07:00
Joey Caparas
f868301fa7 Merge branch 'atp-ibiza-intune' of https://github.com/Microsoft/win-cpub-itpro-docs into atp-ibiza-intune 2017-04-17 10:48:58 -07:00
Joey Caparas
fed59d91fc Merge remote-tracking branch 'refs/remotes/origin/master' into atp-ibiza-intune 2017-04-17 10:40:15 -07:00
Joey Caparas
f3e3bc061b Merge remote-tracking branch 'refs/remotes/origin/master' into atp-ibiza-intune 2017-04-17 10:33:00 -07:00
LizRoss
748bc3ae5a Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2017-04-17 09:39:20 -07:00
Elizabeth Ross
00f27a11f6 Merge pull request #162 from jmullman/patch-2
Added caveat for line 110: group membership in offline migration
2017-04-17 09:38:14 -07:00
Brian Lich
bb842731e7 new topic 2017-04-17 08:33:34 -07:00
Elizabeth Ross
e1013bdf74 Merge pull request #621 from brianlic-msft/master
public github issue #160
2017-04-17 07:06:53 -07:00
Brian Lich
b1eb082c5b public github issue #160 2017-04-16 18:56:17 -07:00
Elizabeth Ross
10614cb4a4 Merge pull request #620 from Microsoft/minortypos
Minortypos
2017-04-14 17:01:13 -07:00
Greg Lindsay
331078a62b fix conflicts 2017-04-14 16:47:57 -07:00
Greg Lindsay
cf91420f4b minor changes 2017-04-14 16:40:01 -07:00
Greg Lindsay
30b924bf40 several fixes 2017-04-14 16:27:15 -07:00
LizRoss
ed76ef039f Merge remote-tracking branch 'refs/remotes/origin/master' into vs-intunechanges 2017-04-14 16:16:47 -07:00
LizRoss
5f552cc094 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-uatfixes 2017-04-14 16:16:10 -07:00
Brian Lich
e544b400f1 removing duplicate asset id 2017-04-14 15:56:29 -07:00
Brian Lich
04b2fb0380 removing duplicate asset ID 2017-04-14 15:54:20 -07:00
Brian Lich
28847fe82d removing duplicate asset ID 2017-04-14 15:46:52 -07:00
Brian Lich
15cb15b658 removing duplicate asset ID 2017-04-14 15:45:19 -07:00
Brian Lich
d854bc7a61 removing duplicate asset ID 2017-04-14 15:44:10 -07:00
Brian Lich
035cd28d7c Removing duplicate assetid 2017-04-14 15:42:37 -07:00
Brian Lich
a3dceb4d47 Removing duplicate assetid 2017-04-14 15:41:50 -07:00
Brian Lich
854a62f952 Removing duplicate assetid 2017-04-14 15:40:21 -07:00
Elizabeth Ross
e00ba9dbce Merge pull request #619 from Microsoft/vs-uatfixes
Removed dupe file
2017-04-14 15:37:33 -07:00
Brian Lich
4f4552b50d Removing duplicate assetid 2017-04-14 15:26:17 -07:00
LizRoss
38bc3d5219 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-uatfixes 2017-04-14 15:20:22 -07:00
LizRoss
57091ea335 Duplicate content from index.md 2017-04-14 15:20:18 -07:00
Brian Lich
8b52ed1cd4 Delete how-to-deploy-the-app-v-51-server.1.md 2017-04-14 15:20:05 -07:00
Brian Lich
039df9820b Removing ms.assetID 2017-04-14 15:17:00 -07:00
LizRoss
d7eac3db60 Merge remote-tracking branch 'refs/remotes/origin/master' into vs-uatfixes 2017-04-14 15:06:29 -07:00
LizRoss
77deccd50c Merge remote-tracking branch 'refs/remotes/origin/master' into vs-intunechanges 2017-04-14 15:05:56 -07:00
Brian Lich
69d50622a4 removing incorrect metadata 2017-04-14 15:03:53 -07:00
Brian Lich
c6901970a0 removing incorrect metadata 2017-04-14 15:03:36 -07:00
Elizabeth Ross
2904e813e2 Merge pull request #618 from Microsoft/educompliance
small corrections
2017-04-14 14:44:37 -07:00
Celeste de Guzman
f148190bed small corrections 2017-04-14 14:14:52 -07:00
James Mitchell Ullman
9119cf2eea Added caveat for line 110
Per [Offline Migration Reference](https://technet.microsoft.com/en-us/itpro/windows/deploy/offline-migration-reference), user-group memberships are *not* migrated by default. Use of the **<ProfileControl>** section in Config.xml is required.
2017-04-14 16:16:11 -04:00
Elizabeth Ross
c696d8257a Merge pull request #616 from Microsoft/vs-uatfixes
Fixed conflict
2017-04-14 10:34:08 -07:00
LizRoss
b26e1f1807 Fixing conflict 2017-04-14 10:15:22 -07:00