Files
Orchard/src/Orchard.Web/Modules/Orchard.Azure.MediaServices/Services
Sebastien Ros 8dfd9048b3 Merge branch '1.8.x' into 1.x
Conflicts:
	src/Orchard.Web/Modules/Orchard.Indexing/Settings/EditorEvents.cs
	src/Orchard.Web/Modules/Orchard.MediaLibrary/Views/EditorTemplates/Fields/MediaLibraryPicker.Edit.cshtml
2014-09-19 10:19:29 -07:00
..