Files
Orchard/src/Orchard.Web/Modules/Orchard.Localization/Providers
Sipke Schoorstra 4159584d85 Merge branch 'dev' into issue/homepage-alias
Conflicts:
	src/Orchard.Web/Modules/Orchard.Autoroute/Drivers/AutoroutePartDriver.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Handlers/AutoroutePartHandler.cs
	src/Orchard.Web/Modules/Orchard.Autoroute/Services/AutorouteService.cs
2015-07-24 13:33:36 +01:00
..