Shannon
1361e017a2
Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222
Conflicts:
src/Umbraco.Core/Security/BackOfficeUserManager.cs
src/Umbraco.Web.UI.Client/src/less/pages/login.less
src/Umbraco.Web.UI.Client/src/routes.js
src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
src/Umbraco.Web.UI/web.Template.config
src/Umbraco.Web/Editors/AuthenticationController.cs
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Umbraco.Web.csproj
2016-04-12 18:07:25 +02:00
..
2016-03-15 15:08:53 +01:00
2016-04-05 08:03:47 +02:00
2015-11-13 13:38:30 +01:00
2016-02-10 16:22:06 +01:00
2015-02-04 12:11:10 +11:00
2015-01-30 19:04:39 +11:00
2016-02-10 14:54:00 +01:00
2016-02-10 14:54:00 +01:00
2016-02-10 14:54:00 +01:00
2016-02-10 14:54:00 +01:00
2015-01-02 15:34:51 +11:00
2015-01-02 15:34:51 +11:00
2015-01-02 15:34:51 +11:00
2016-02-10 14:53:58 +01:00
2015-09-01 15:00:27 +02:00
2015-08-27 14:56:42 +02:00
2016-04-12 18:07:25 +02:00
2016-04-12 18:07:25 +02:00
2015-03-18 10:41:15 +01:00
2015-04-01 13:41:33 +11:00
2016-04-12 18:07:25 +02:00