Merge commit '060e584503039ac020f79602ae9565d7ee0531bb' into 7.0.2

src/Umbraco.Core/Publishing/PublishStatus.cs

@@ -26,9 +26,9 @@ namespace Umbraco.Core.Publishing
         /// </summary>
         public PublishStatus(IContent content)
             : this(content, PublishStatusType.Success)
-        {            
+        {
         }
-        
+
         public IContent ContentItem { get; private set; }
         public PublishStatusType StatusType { get; internal set; }
 

src/Umbraco.Core/Services/IContentService.cs

@@ -128,7 +128,7 @@ namespace Umbraco.Core.Services
         /// <param name="contents">Collection of <see cref="IContent"/> to save</param>
         /// <param name="userId">Optional Id of the User saving the Content</param>
         /// <param name="raiseEvents">Optional boolean indicating whether or not to raise events.</param>
-        void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);		
+        void Save(IEnumerable<IContent> contents, int userId = 0, bool raiseEvents = true);
 
         /// <summary>
         /// Deletes all content of specified type. All children of deleted content is moved to Recycle Bin.

src/Umbraco.Tests/Macros/MacroTests.cs

@@ -26,9 +26,9 @@ namespace Umbraco.Tests.Macros
                 new NullCacheProvider());
             ApplicationContext.Current = new ApplicationContext(cacheHelper);
             ProfilerResolver.Current = new ProfilerResolver(new LogProfiler())
-                                           {
-                                               CanResolveBeforeFrozen = true
-                                           };
+            {
+                CanResolveBeforeFrozen = true
+            };
         }
 
         [TearDown]

src/Umbraco.Tests/unit-test-log4net.config

@@ -27,10 +27,10 @@
   <logger name="Umbraco.Core.Persistence.Migrations.Initial.DatabaseSchemaCreation">
     <level value="WARN" />
   </logger>
-  
+
   <logger name="Umbraco.Core.Persistence.Migrations.Initial.BaseDataCreation">
     <level value="WARN" />
-  </logger>  
+  </logger>
 
   <appender name="ConsoleAppender" type="log4net.Appender.ConsoleAppender" >
     <target value="Console.Out" />

src/umbraco.cms/businesslogic/member/Member.cs

@@ -782,7 +782,7 @@ namespace umbraco.cms.businesslogic.member
             }
             return _password;
         }
-
+        
         /// <summary>
         /// Adds the member to group with the specified id
         /// </summary>