Files
Orchard/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services
Sebastien Ros 84993f3a4e Merge branch '1.8.x' into 1.x
Conflicts:
	src/Orchard.Web/Modules/Orchard.Alias/Implementation/Updater/AliasHolderUpdater.cs
	src/Orchard.Web/Modules/Orchard.Alias/Orchard.Alias.csproj
	src/Orchard.Web/Modules/Orchard.Indexing/Services/IndexingTaskExecutor.cs
2014-09-18 10:53:40 -07:00
..