Shannon 51b19bedc8 Merge remote-tracking branch 'origin/dev-v7' into user-group-permissions ...

# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/GravatarController.cs
#	src/Umbraco.Web/Models/Mapping/UserModelMapper.cs

2017-06-14 22:30:36 +02:00

..

NuSpecs

Merge pull request #1945 from protherj/U4-9792-fips-support

2017-06-13 15:05:21 +02:00

Build.bat

Merge branch 'dev-v7' into dev-v7.6

2017-05-05 16:19:54 +02:00

Build.proj

Build TLC

2016-10-05 14:35:44 +02:00

BuildBelle.bat

Make new build work when there's spaces in the current path

2017-05-05 16:14:59 +02:00

BuildDocs.bat

U4-8500 Get c# docs building (#1291)

2016-05-30 12:02:13 +02:00

BuildDocs.ps1

Fixes docs build

2017-05-19 10:20:00 +10:00

InstallGit.cmd

Build TLC

2016-10-05 14:35:44 +02:00

ReplaceIISExpressPortNumber.exe

…

RevertToCleanInstall.bat

Improves clean scripts for Claus

2015-11-09 09:25:59 +01:00

RevertToEmptyInstall.bat

Improves clean scripts for Claus

2015-11-09 09:25:59 +01:00

UmbracoVersion.txt

Bumps version

2017-06-05 16:33:47 +02:00