yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '6.1.2' into 7.0.0

Browse Source 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/config/ClientDependency.config
This commit is contained in:
Shannon
2013-06-21 15:49:40 +10:00
parent 7a94b49b34 eac66f5696
commit c81cd0fd1d
3 changed files with 93 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@@ -84,4 +84,5 @@ src/Umbraco.Web.UI.Client/[Bb]uild/[Bb]elle/
src/Umbraco.Web.UI/[Uu]ser[Cc]ontrols/
build/_BuildOutput/
src/Umbraco.Web.UI.Client/src/[Ll]ess/*.css
tools/NDepend/