Files
Orchard/lib/windowsazure
Sebastien Ros f1cd6aa38d Merge branch '1.9.x' into dev
Conflicts:
	lib/windowsazure/Microsoft.WindowsAzure.Storage.xml
	src/Orchard.Specs/Hosting/Orchard.Web/Web.config
	src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Web.config
	src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
	src/Orchard.Web/Modules/Orchard.Taxonomies/Drivers/TaxonomyFieldDriver.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Handlers/TermsPartHandler.cs
	src/Orchard.Web/Modules/Orchard.Taxonomies/Services/TermCountProcessor.cs
	src/Orchard.Web/Web.config
2015-10-15 15:07:19 -07:00
..
2015-09-30 15:50:05 -07:00
2015-09-30 15:50:05 -07:00
2015-09-30 15:50:05 -07:00