ytaous c38a60a450 resolving conflicts from master (#3691) ... * resolving conflicts * resolving conflicts * resolving conflicts * resolve conflicts Co-authored-by: Ethan Tao <ettao@microsoft.com>		2020-04-24 14:38:30 -07:00
..
ci_build	resolving conflicts from master (#3691)	2020-04-24 14:38:30 -07:00
nuget	Fork the WinML APIs into the Microsoft namespace (#3503)	2020-04-17 06:18:54 -07:00
python	Fix gen_doc build option and refresh documentation (#3545)	2020-04-17 14:41:04 -07:00