Files
Orchard/src/Orchard.Web/Modules/Orchard.Layouts/Styles
Sipke Schoorstra 4e61c3314d Merge branch '1.9.x' into dev
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Views/EditorTemplates/Parts.Autoroute.Edit.cshtml
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.js
	src/Orchard.Web/Modules/Orchard.DynamicForms/Scripts/LayoutEditor.min.js
	src/Orchard.Web/Modules/Orchard.Layouts/Drivers/LayoutPartDriver.cs
	src/Orchard.Web/Modules/Orchard.Layouts/Orchard.Layouts.csproj
2015-07-04 14:35:41 +02:00
..
2015-07-04 11:42:50 +02:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2015-07-04 14:35:41 +02:00
2015-06-20 23:30:49 +03:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00
2014-10-14 16:07:00 -07:00