Merge pull request #3452 from microsoft/lamil/merge_master_into_next

lauren-mills · web-flow · commit 7e19a4451542 · 2020-06-08T10:30:15.000-07:00
Merger latest master into next
diff --git a/.gitignore b/.gitignore
@@ -361,6 +361,7 @@ ASALocalRun/
 **/.deployment
 **/ComposerDialogs/generated
 **/ComposerDialogs/settings
+**/VirtualAssistant/generated
 
 # Zip files
 *.7z
