Merge branch 'Develop' of https://github.com/unitycontainer/container into Develop

# Conflicts:
#	src/UnityContainer.Registry.cs
#	tests/Unity.Diagnostic.Async/Unity.Specification.Tests.Diagnostic.Async.csproj
#	tests/Unity.Specification.Async/Unity.Specification.Tests.Async.csproj

This commit is contained in:

Eugene Sadovoi

2019-04-09 22:56:30 -04:00

Родитель 53fd48355d e0ea6e2cd5

Коммит 095e7046a9

Merge branch 'Develop' of https://github.com/unitycontainer/container into Develop

Разница недоступна