Shannon
0a7bbfb1ca
Merge remote-tracking branch 'origin/6.2.5' into 7.2.1
Conflicts:
src/Umbraco.Core/Configuration/UmbracoSettings.cs
src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
src/Umbraco.Tests/Umbraco.Tests.csproj
src/Umbraco.Web.UI/install/steps/defaultUser.ascx
src/Umbraco.Web.UI/web.Template.Debug.config
src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
src/Umbraco.Web/Scheduling/IBackgroundTask.cs
src/Umbraco.Web/Scheduling/KeepAlive.cs
src/Umbraco.Web/Scheduling/LogScrubber.cs
src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
src/Umbraco.Web/Scheduling/ScheduledTasks.cs
src/Umbraco.Web/Scheduling/Scheduler.cs
src/Umbraco.Web/Scheduling/TaskEventArgs.cs
src/Umbraco.Web/Umbraco.Web.csproj
2014-12-08 17:16:16 +11:00
..
2013-09-13 18:11:20 +10:00
2013-09-25 19:23:41 +10:00
2014-06-20 14:34:21 +10:00
2013-03-07 23:23:20 +06:00
2014-08-05 12:49:51 -06:00
2014-08-05 12:49:51 -06:00
2014-03-24 15:41:46 +11:00
2014-03-24 15:41:46 +11:00
2013-03-23 01:59:25 +06:00
2014-06-08 12:49:20 +02:00
2014-12-08 17:16:16 +11:00
2014-03-24 15:41:46 +11:00
2014-03-24 15:41:46 +11:00
2014-08-05 10:32:07 -06:00