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

Merge remote-tracking branch 'refs/remotes/origin/dev-v7.6' into temp-U4-9310

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Models/UmbracoObjectTypes.cs
This commit is contained in:
Shannon
2017-02-01 15:23:29 +11:00
parent 384a31e3c6 fa56f1a59d
commit ff6ea0b42e
25 changed files with 312 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Configuration/UmbracoVersion.cs
View File

@@ -24,7 +24,7 @@ namespace Umbraco.Core.Configuration
/// Gets the version comment (like beta or RC).
/// </summary>
/// <value>The version comment.</value>
public static string CurrentComment { get { return "alpha055"; } }
public static string CurrentComment { get { return "alpha056"; } }
// Get the version of the umbraco.dll by looking at a class in that dll
// Had to do it like this due to medium trust issues, see: http://haacked.com/archive/2010/11/04/assembly-location-and-medium-trust.aspx