Merge branch 'pei-changes' into develop · Workshell/pe@95f8859 · GitHub

Commit

Merge branch 'pei-changes' into develop

Browse files

# Conflicts:
#	src/Workshell.PE.Resources/Workshell.PE.Resources.csproj
#	src/Workshell.PE/Utils.cs
#	tests/Workshell.PE.Tests/Workshell.PE.Tests.csproj

Loading branch information

Lloyd Kinsella committed May 20, 2023

2 parents da9cf7b + 3744f8d commit 95f8859