Lombiq 5a6b56cc72 Merge branch '1.10.x' into dev ...

# Conflicts:
#	src/Orchard.Azure.Tests/Orchard.Azure.Tests.csproj
#	src/Orchard.Azure/Orchard.Azure.Web/Orchard.Azure.Web.csproj
#	src/Orchard.Web/Modules/Orchard.Taxonomies/Orchard.Taxonomies.csproj
#	src/Orchard.Web/packages.config

2017-12-22 21:05:17 +01:00

21 KiB

Raw Blame History

View Raw