4 Commits

Author SHA1 Message Date
LizRoss
625389552a Merge remote-tracking branch 'origin/master'
# Conflicts:
#	windows/manage/manage-cortana-in-enterprise.md
2016-04-06 14:57:38 -07:00
LizRoss
432d940bfa Cleaning up after conversion 2016-04-06 13:37:36 -07:00
jdeckerMS
7674581ad1 update author 2016-04-05 11:38:41 -07:00
Brian Lich
6d38dc68b7 refreshing conversion test build 2016-03-21 11:28:01 -07:00