Merge branch origin/dev-v7 into dev-v7-deploy

2016-08-26 13:20:53 +02:00
parent 0789295701 be57692a62
commit 41fafaf7ae
22 changed files with 61 additions and 286 deletions
--- a/src/Umbraco.Core/Configuration/UmbracoVersion.cs
+++ b/src/Umbraco.Core/Configuration/UmbracoVersion.cs
@@ -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 "alpha003"; } }
+        public static string CurrentComment { get { return "alpha004"; } }

        // 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