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

Merge remote-tracking branch 'origin/7.3.8' into dev-v7

Browse Source 
Conflicts:
	src/Umbraco.Web.UI/packages.config
This commit is contained in:
Sebastiaan Janssen
2016-02-17 11:56:24 +01:00
parent f941456af6 1bfc1229bd
commit 7debe17c58
10 changed files with 38 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build/Build.proj
View File

@@ -175,8 +175,8 @@
<!-- Copy SQL CE -->
<ItemGroup>
<SQLCE4Files
Include="..\src\packages\SqlServerCE.4.0.0.0\**\*.*"
Exclude="..\src\packages\SqlServerCE.4.0.0.0\lib\**\*;..\src\packages\SqlServerCE.4.0.0.0\**\*.nu*"
Include="..\src\packages\SqlServerCE.4.0.0.1\**\*.*"
Exclude="..\src\packages\SqlServerCE.4.0.0.1\lib\**\*;..\src\packages\SqlServerCE.4.0.0.1\**\*.nu*"
/>
</ItemGroup>