Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release/dev17.12' into merges/…
Browse files Browse the repository at this point in the history 
…release/dev17.12-to-main

# Conflicts:
#	src/Razor/test/Microsoft.VisualStudio.Razor.IntegrationTests/Microsoft.VisualStudio.Razor.IntegrationTests.csproj
  • Loading branch information
@davidwengier
davidwengier committed Aug 14, 2024
2 parents 77e74bd + 5954852 commit ee177e5
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit ee177e5

Please sign in to comment.