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

Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7

Browse Source 
# Conflicts:
#	.gitignore
#	build/UmbracoVersion.txt
#	src/Umbraco.Web.UI.Client/src/views/content/content.edit.controller.js
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
This commit is contained in:
Sebastiaan Janssen
2017-09-11 15:46:54 +02:00
parent fb60647b5a 857b7cc608
commit 3275f03aff
45 changed files with 2172 additions and 1142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
View File

@@ -93,7 +93,6 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
<Import Project="$(SolutionDir)\.nuget\nuget.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">