Shannon
8c771660a7
Merge remote-tracking branch 'origin/7.3.0' into dev-v8
Conflicts:
src/Umbraco.Core/Services/UserService.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web.UI/packages.config
src/Umbraco.Web/Routing/ContentFinderByLegacy404.cs
src/Umbraco.Web/Routing/NotFoundHandlerHelper.cs
src/Umbraco.Web/umbraco.presentation/NotFoundHandlers.cs
src/Umbraco.Web/umbraco.presentation/library.cs
src/umbraco.MacroEngines/app.config
src/umbraco.MacroEngines/packages.config
src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
src/umbraco.editorControls/app.config
src/umbraco.providers/UsersMembershipProvider.cs
src/umbraco.providers/app.config
2015-05-13 14:49:11 +10:00
..
2014-01-24 18:23:37 +11:00
2015-05-13 14:49:11 +10:00
2015-05-01 14:27:26 +02:00
2015-05-05 12:27:01 +10:00
2014-05-16 12:27:54 +02:00
2014-01-24 18:23:37 +11:00
2014-10-19 13:00:54 +02:00
2013-06-23 15:13:27 +02:00
2013-02-27 13:51:58 -01:00
2013-04-25 09:02:58 -02:00
2015-05-06 11:08:25 +02:00