lsm/Orchard
1
0
Fork 0
mirror of https://github.com/OrchardCMS/Orchard.git synced 2026-02-09 09:16:41 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
Files
3061412961739e70f617db6044e30ebf7b29d9c6
Orchard/src/Tools
History
Sebastien Ros 6c0b85ad74 Merge branch 'master' into 1.x 
Conflicts:
	ClickToBuildAzurePackage.cmd
	src/Orchard.Azure/Orchard.Azure.Web/Web.config
	src/Orchard.Web/Modules/Orchard.CustomForms/Controllers/ItemController.cs
	src/Orchard.Web/Modules/SysCache/Web.config
	src/Orchard.Web/Orchard.Web.csproj
2013-11-11 18:11:53 -08:00
..
MSBuild.Orchard.Tasks
Merge branch 'master' into 1.x
2013-11-11 18:11:53 -08:00
Orchard
Merge branch 'master' into 1.x
2013-11-11 18:11:53 -08:00
Orchard.Tests
Merge branch 'master' into 1.x
2013-11-11 18:11:53 -08:00