Files
Orchard/src/Orchard.Tests
jtkech 5f65c5101d Merge branch 'dev' into patch-2
Conflicts:
	src/Orchard.Tests/Environment/DefaultWorkContextAccessorTests.cs
	src/Orchard.Tests/Environment/ShellBuilders/DefaultShellContextFactoryTests.cs
	src/Orchard.Tests/Tasks/SweepGeneratorTests.cs
	src/Orchard/Environment/WorkContextAccessor.cs
	src/Orchard/Mvc/MvcModule.cs
2015-12-15 06:12:42 +01:00
..
2015-12-15 06:12:42 +01:00