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

3341 Commits

Author SHA1 Message Date
jdeckerMS
e2ecf7ebd0 rewrite note 2016-12-01 11:49:26 -08:00
Brian Lich
7c2dd31184 Merge pull request #83 from tonyartisan/patch-1 
Update implement-microsoft-passport-in-your-organization.md
 2016-12-01 11:46:44 -08:00
Justin Hall
09c61042f7 Merge pull request #289 from Justinha/VSTS10015803 
copyedits
 2016-12-01 10:00:12 -08:00
Justinha
ec7ea75380 copyedits 2016-12-01 09:57:55 -08:00
Brian Lich
1f1f158281 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-12-01 09:27:29 -08:00
tonyartisan
3642b8c5bf Update implement-microsoft-passport-in-your-organization.md 
I am managing a server with Windows Server 2012 R2 Essentials (build 9600) and this text misled me to believe that **Turn on PIN sign-in** group policy did not affect the convenience PIN for computers running version 1607. This was upsetting because group policies relevant to the Windows Hello for Business component are not available until Windows Server 2016. After further research and experimentation, I found that **Turn on PIN sign-on** group policy object set by the server does override the **Turn on convenience PIN sign-in** local policy.
 2016-12-01 09:39:10 -06:00
Justinha
475179d662 removed references to Device Health Attestation requires TPM 2.0 2016-11-30 16:04:50 -08:00
Zach Dvorak
6ad6cc99b2 Update upgrade-analytics-get-started.md 2016-11-30 15:14:44 -08:00
jdeckerMS
02f058b374 verbatims 2016-11-30 14:27:57 -08:00
jdeckerMS
9dc23fbc5c link to consumer info 2016-11-30 14:12:47 -08:00
jdeckerMS
113f2bc328 fix typo 2016-11-29 11:27:58 -08:00
jdeckerMS
cb0321a2fd links 2016-11-29 11:27:58 -08:00
Brian Lich
ee8f7042d0 Merge pull request #80 from bryandam/patch-1 
Update waas-branchcache.md
 2016-11-29 10:39:39 -08:00
jdeckerMS
c269c3fa8b update 2016-11-29 09:37:27 -08:00
jdeckerMS
6ab3564941 sync 2016-11-29 09:09:41 -08:00
jdeckerMS
79e1cf7eff add link 2016-11-29 08:14:01 -08:00
jdeckerMS
d6eb219de8 Merge remote-tracking branch 'refs/remotes/origin/master' into jd-sandbox 2016-11-29 08:09:59 -08:00
Brian Lich
944e6bae85 removing TPM 2.0 requirement for DHA 2016-11-28 13:55:55 -08:00
bryandam
7232a66643 Update waas-branchcache.md 
The first paragraph of the Configure clients for BranchCache section was duplicated.  I kept the version with links.  Thanks for your work!
 2016-11-28 15:39:05 -05:00
Brian Lich
e8e5a691e2 fixing typo 2016-11-28 10:44:30 -08:00
jdeckerMS
22fc1f522f loc fix 2016-11-28 10:23:34 -08:00
JanKeller1
d1cb5a21f2 Fixed link that, thru redirect, was circular 2016-11-22 15:53:39 -08:00
jdeckerMS
2d14c60f32 add to change history 2016-11-22 08:41:05 -08:00
jdeckerMS
1e2adfbecc add switch branches 2016-11-22 08:39:44 -08:00
jdeckerMS
8b10171243 format fix 2016-11-21 13:21:45 -08:00
jdeckerMS
266d6a25f5 format 2016-11-21 13:20:31 -08:00
jdeckerMS
e69b52ebe5 add links 2016-11-21 13:08:27 -08:00
jdeckerMS
d6d5a0f943 correction 2016-11-21 09:43:20 -08:00
Michael Niehaus
dfe162a041 Update windows-10-upgrade-paths.md 
Adding more clarity on the LTSB item to address CSS feedback.
 2016-11-18 12:37:03 -08:00
Zach Dvorak
cfb36ae8b6 Update upgrade-analytics-resolve-issues.md 
Clarifying that only apps and drivers can be marked "Won't Upgrade".  Users cannot define an Upgrade Decision for computers.
 2016-11-17 17:22:48 -08:00
Brian Lich
8b93a2e22d merging live 2016-11-17 10:00:20 -08:00
Brian Lich
914255b700 updating speech model registry setting 2016-11-16 14:55:24 -08:00
JanKeller1
ce43bd8f7c Added comparison betw Remote Cred Gd & Remote Admin mode 2016-11-16 13:38:21 -08:00
LizRoss
64da78a157 Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-16 09:52:37 -08:00
Brian Lich
840d982e37 Merge branch 'master' of https://github.com/Microsoft/windows-itpro-docs 2016-11-16 08:38:25 -08:00
Zach Dvorak
1e6fb07834 Update upgrade-analytics-get-started.md 
Updated the IE Site Discovery requirements to include KB3080149.  This is mentioned as a requirement on the Review Site Discovery page, but it was not included on the Getting Started page.
 2016-11-15 16:58:38 -08:00
Greg Lindsay
80bee31df7 Merge branch 'minortypos' 2016-11-15 14:32:28 -08:00
Greg Lindsay
48e1ab856e update header 2016-11-15 14:31:28 -08:00
jdeckerMS
e4a347e376 Merge branch 'master' of https://github.com/Microsoft/win-cpub-itpro-docs 2016-11-15 13:03:24 -08:00
jdeckerMS
28c2d520be change sentence 2016-11-15 13:03:15 -08:00
JanKeller1
d70887ef23 Fixed a link that is basically useless 2016-11-15 11:58:33 -08:00
jdeckerMS
bbe791e5e3 loc fixes 2016-11-15 11:34:30 -08:00
Greg Lindsay
035cdd0955 Merge branch 'minortypos' 2016-11-15 11:32:02 -08:00
Greg Lindsay
1ec1f3976d strengthened intro 2016-11-15 11:30:16 -08:00
Brian Lich
577be96d17 fixed typo 2016-11-15 11:20:29 -08:00
LizRoss
97e66f91ef Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-15 10:12:08 -08:00
jdeckerMS
ae30a534d3 Squashed commit of the following: 
commit 4f8b289498efa1648b907f7d1f623d441a33497b
Merge: 4735f9c 7ac5c10
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Nov 15 08:54:28 2016 -0800

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdsec

commit 4735f9cfa6aa55b9a0b958be1538f13bd3234281
Merge: f9728b1 01ec7e8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 09:33:30 2016 -0800

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdsec

commit f9728b152ea3ed87d25810425351070750e37c76
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 07:28:32 2016 -0800

    passport
 2016-11-15 08:55:10 -08:00
jdeckerMS
21a4d0aac8 Squashed commit of the following: 
commit dca2a868af8d1c1baedcc0acecff617a91fe481a
Merge: d6ec703 4a71f17
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Nov 15 07:05:40 2016 -0800

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit d6ec7035c3ae80e0f5c24851017e3d1882988fb8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 13:45:52 2016 -0800

    format note

commit da0405941ddbedbed827761ece9c7a7c0983116c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 13:31:36 2016 -0800

    fix index

commit 200976c83059378e952a678c91cbce8186d020a9
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 12:25:00 2016 -0800

    fix note

commit 4260d50e1a1d962e96a1e5597273ac588fce1959
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 12:04:01 2016 -0800

    password change

commit 57cad860cf903a642767c18faaab71f5e0d2d094
Merge: 1b3b23c 01ec7e8
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 14 11:57:35 2016 -0800

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 1b3b23c8339569bf51336467602a9a65af2a5701
Merge: feee3be ea87bea
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 7 07:21:53 2016 -0800

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit feee3be7e77e33ba8c28df3bc232c1aa3e7b61d5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Nov 7 07:21:20 2016 -0800

    fix dev mode note

commit 1eff5227eddf3f191b99fe6c01b322f18d73bc39
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Nov 4 17:33:51 2016 -0700

    Xerxes feedback

commit 93bd803abe9f37f1d5ec1ed206ee6b4a5f47748e
Merge: 70bf588 0945bb5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Nov 4 17:26:13 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 70bf58825b7a4b1d33aa4b9ac0991193854cb840
Merge: 96eaa74 46d5daa
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Nov 3 07:07:50 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 96eaa74b799d38856aad2307323247b513ad7b54
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 14:11:49 2016 -0700

    tweak

commit 0b83d41bb461bdb2e448312230383b835b207473
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:58:19 2016 -0700

    universal app install

commit 32a236a770f4d44706c1ff6ccf42ad5356c72e17
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:56:29 2016 -0700

    store apps

commit 4b4740c7b1cb059a866002f2efeb59a741b3943f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:52:51 2016 -0700

    fix

commit 0c59a0748834abc6a4e6891d46bb8278c539c38e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:46:55 2016 -0700

    para

commit ec14c0bb9831ef0244aeb15315e7101b9d0398e4
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:42:21 2016 -0700

    provpkg

commit 95415738289b0aaaafc82bec086da02c210d11ad
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 13:14:33 2016 -0700

    setup complete

commit 4fae558cf3e43e03057d4803c3f61bc588d20611
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 12:18:40 2016 -0700

    dev mode

commit 757ddd1571f5a85137a5c886523241a5a0f3a38a
Merge: 54df2f7 e483298
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 11:57:55 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 54df2f7925623e0e34f96ddca27708b9c30bf9c6
Merge: 716c9c4 6bf039a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 11:43:26 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 716c9c4acb1f81b0ea26f6eb432fcb7771f2f797
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 11:42:02 2016 -0700

    fix bookmark links

commit b209765c03ad8512d72dd17ce360de0f5514e268
Merge: 7dd01fa 4bbc613
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 10:55:50 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 7dd01faa42f4c212289ad831068b93142f3af812
Merge: 8741dac 3a4201f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Nov 2 10:55:28 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

    # Conflicts:
    #	windows/manage/waas-wufb-group-policy.md

commit 8741dac33c4d49464a35061cb14108e735855061
Merge: 666383e 28f2065
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 31 07:20:09 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 666383eaf9840b0c5fb44d58270958048b7628d2
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 13:25:34 2016 -0700

    tweak html

commit 6f1fe823f090398ef6b8fe1d92b7a08fc6c77fe3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 13:09:24 2016 -0700

    fix link

commit 1090466385bb02a78498414a123c02b7b9eb0b75
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 12:58:28 2016 -0700

    fix html

commit 7c94bcca2aec19a7f5452661128f1de5b4359c9c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 12:24:45 2016 -0700

    cell width

commit 9edb64b028026604a643d7e803473ba046ca9efa
Merge: 1edd610 4a02ada
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 12:23:44 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 1edd610774f8037c15f40a2f0aa4201461c8aa3f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 11:58:50 2016 -0700

    revise

commit dc5515b42826697ce6495c2e44d3a70ea7144de2
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 11:15:53 2016 -0700

    updates

commit 1e5b4bd762a8148e21c61bb8b55d612cd5fcaef8
Merge: da29a85 339f8ae
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 28 11:04:14 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit da29a857837477afea4c7645e1fda0fcfffb29b4
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 27 10:09:43 2016 -0700

    sync

commit a155a1550d026fb911ccde7ca8f06f213302a24c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 27 09:59:53 2016 -0700

    sync

commit 6360103ba43b7a8a68410050e189f26ab745dc94
Merge: ddd71d7 72bcd0a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 27 08:27:05 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit ddd71d7bb1f75840c81128ea391415e9f9413d4e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 26 14:38:26 2016 -0700

    sync

commit 07df18e231fba558063b30848cb9a42172c9548b
Merge: bb053cf 4a15c27
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 26 10:09:25 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit bb053cf30bcec726edf3895358a044cbda9b97e5
Merge: 17038fa 1e0ba5e
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 26 10:07:49 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 17038fae368e915ef6fd4e9eeb3f2bf400ff1f10
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 26 10:07:21 2016 -0700

    sync

commit a959cafb2f43fa3816b8ee7fc967d4d0d6e0737b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 25 13:01:22 2016 -0700

    sync

commit 2e225a12f714c977668fdb90b57d830d33fe348e
Merge: 0e9ef0d 7202a3b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 25 13:00:59 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 0e9ef0d0f572a21e6a648a47fd3ea97e5942cc16
Merge: 61b78c5 0eb189b
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 25 09:58:55 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 61b78c5024971ff91e0ac73d8d43fafed36c7bac
Merge: 539ce55 0ff1977
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 25 07:37:48 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 539ce55b3d3d8461cde7a5ae12dc5d5cd3f3aca9
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 24 14:21:55 2016 -0700

    branch change

commit 9d05f9819076fbd7e77cf27cf81565cc28c248ea
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 13:47:11 2016 -0700

    fix link

commit a4bc18a1d4fe605b1d994ca36e629c6c4e05d879
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 13:43:40 2016 -0700

    ADD COMMENT

commit 5d3a83ffaf4ce9f4445975342ec0c3f2281bdcae
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 13:34:34 2016 -0700

    sync

commit fa1186dda46569ff44e4acf7819f24fd9df22c18
Merge: f90732d b247f88
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 10:22:23 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit f90732de71110d9fe817a00b88cc3bbd4a6aa1e5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 10:21:30 2016 -0700

    upgrade topic

commit 0ec13a885eafe0a3f8453a10cba6c47fda8edae5
Merge: 3db6056 8103e45
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 09:05:26 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 3db605640c2cbfef4f26512f3fa1ea6e78ee6647
Merge: 6f40a43 bbea844
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 06:57:40 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 6f40a437b66124c736c5dbcc2de24af15069a61a
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Fri Oct 21 06:57:12 2016 -0700

    sync

commit 59da16c0f4b4021affc8f1fb364e8147ea3edd72
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 20 14:49:10 2016 -0700

    sync

commit 2e910e8deda5594b2118b0ea3d7654cf4d25b425
Merge: 3dfbb71 79efa7d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 20 14:49:00 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 3dfbb71cb94a5e832da0c70d287dde1d58c4547d
Merge: fef4624 2c7daec
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 20 12:53:29 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit fef4624e7cd1d6157e18f9e404b149d735d30bc2
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 20 09:50:18 2016 -0700

    sync stage

commit b6af358216d2dad1a2a4abbb58e39bb0a46611a3
Merge: a92c574 d726120
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Thu Oct 20 09:43:02 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

    # Conflicts:
    #	devices/hololens/hololens-checklist.md

commit a92c57403254b15c3b8315702a2a38416d69a0e9
Merge: 4818d5c eb3fd1d
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 19 10:53:32 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 4818d5ccf8b03970a89a2d2caa2aca1e2bfe2bbe
Merge: c67824e c62434c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 19 10:12:36 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit c67824e7df9bd3f86bf07c69777752f021ba8ad0
Merge: 768e547 e7f5095
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 19 09:26:56 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 768e5475a31af3e1422fbc9cb431dbe974f11d8d
Merge: af05ea0 464227c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 19 08:22:59 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit af05ea072d45358265fed6e2f6449bbb2ecad88c
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Wed Oct 19 07:51:14 2016 -0700

    force sync

commit 8221eaf2d1ddb8bed06a76e508f8f51701dccc92
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 14:45:31 2016 -0700

    start prov

commit 04ca41f40a904e15e29b13270656991a18d51617
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 14:35:26 2016 -0700

    sync

commit 1e775a00990941f4a8d378441e4ad1b0e9166196
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 14:31:01 2016 -0700

    fix title

commit 39fa1400846d07fa2fdd6ce1a49193ad8c56e7eb
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 14:28:26 2016 -0700

    resync

commit c76746075fa5b9c373654b105d928bbe0db678f3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 13:55:42 2016 -0700

    install apps

commit f6c6d341953fd64ccc23c6a27a853fcbbb485fd5
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 13:51:22 2016 -0700

    new topic

commit 103ae1c9bf9f1715bfd60041e50277b903d00241
Merge: fc9cc9b 25be0d1
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 13:45:27 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit fc9cc9b89f7d945b59c154dadd0dccc7403f47d4
Merge: 339f2fc b86882f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 13:27:36 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 339f2fc40b8dc6deeb753ad5e27e3fd50de293b0
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 13:26:31 2016 -0700

    kiosk

commit 1609802453fec1ba246582a9f940e47dd982b9ae
Merge: 9627728 ef8a533
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Tue Oct 18 09:38:09 2016 -0700

    Merge remote-tracking branch 'refs/remotes/origin/master' into jdholo

commit 96277287c335ff2e26aa303ca62b5132f06a82cb
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 17 15:02:54 2016 -0700

    sync

commit 9a0053a9c55e2668a884f18ff8dc3959dfc610d6
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 17 14:46:12 2016 -0700

    sync

commit 8a13a2a71bcd745a4ecb1452d198539c9a69bbb3
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 17 14:37:05 2016 -0700

    sync

commit d98591c6eb55bfdddea427648808cb759279a64f
Author: jdeckerMS <jdecker@microsoft.com>
Date:   Mon Oct 17 14:13:12 2016 -0700

    initial staging-skeleton
 2016-11-15 08:03:53 -08:00
LizRoss
bfada1796d Merge remote-tracking branch 'refs/remotes/origin/master' into live 2016-11-14 14:05:25 -08:00
LizRoss
2ce7ea7a55 Fixing TOC hierarchy 2016-11-14 13:26:40 -08:00