Commit Graph

8 Commits

Author SHA1 Message Date
Sebastiaan Janssen
437408464f Merge branch '6.1.5' into 6.2.0
Conflicts:
	.gitignore
	build/Build.bat
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
2013-09-02 12:29:47 +02:00
Shannon
da1c33a034 Fixes unit test 2013-09-02 12:57:56 +10:00
Shannon
36c281a19a updated ignore 2013-08-29 10:08:54 +10:00
Shannon
d78a03a610 Massively improves performance for the packaging service (converting docs to XML) which is used in republishing the tree. 2013-08-05 13:11:47 +10:00
Shannon
b2c604f7b3 updated ignore 2013-06-21 11:26:23 +10:00
Shannon
d3780848dc updated ignore file with correct case sensitivity 2013-06-18 14:20:50 +10:00
Shannon
c9c3623457 updated ignore
Signed-off-by: Shannon <sdeminick@gmail.com>
2013-06-17 02:59:00 +02:00
Sebastiaan Janssen
33ff82e766 Add missing files 2013-06-11 00:47:44 +02:00