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

Merge branch '7.0.3' into 7.1.0

Browse Source 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
This commit is contained in:
Sebastiaan Janssen
2014-02-03 11:52:36 +01:00
parent c52123e878 98684e6292
commit b3f6a8c71b
19 changed files with 179 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -107,4 +107,5 @@ src/Umbraco.Web.UI/[Cc]onfig/appSettings.config
src/Umbraco.Web.UI/[Cc]onfig/connectionStrings.config
src/Umbraco.Web.UI/umbraco/plugins/*
src/Umbraco.Web.UI/umbraco/js/init.js
build/ApiDocs/Output/*
build/ApiDocs/*
build/ApiDocs/Output/*