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-30 17:56:34 +02:00
2016-01-06 18:34:07 +01:00
2016-04-12 18:07:25 +02:00
2016-01-28 18:02:22 +01:00
2016-02-17 10:22:22 +01:00
2016-01-06 18:08:14 +01:00
2016-04-12 18:07:25 +02:00
2016-04-07 16:44:45 +02:00
2016-01-20 16:57:31 +01:00
2016-04-06 20:20:22 +02:00
2016-02-26 11:35:24 +01:00
2016-02-18 11:36:48 +01:00
2016-03-10 15:23:52 +01:00
2016-04-07 17:51:09 +02:00
2016-03-10 15:23:52 +01:00
2016-03-15 09:22:18 +01:00
2016-02-05 14:37:01 +01:00
2016-04-04 09:20:59 +02:00
2016-04-07 16:44:45 +02:00
2016-03-15 17:26:05 +01:00
2016-01-06 18:08:14 +01:00
2016-04-12 18:07:25 +02:00
2016-02-16 15:07:42 +01:00
2016-02-10 14:53:56 +01:00
2016-02-10 14:53:56 +01:00
2016-02-16 15:07:42 +01:00
2016-04-07 17:51:09 +02:00
2016-01-20 13:37:47 +01:00
2016-02-16 15:07:42 +01:00
2016-02-17 10:22:37 +01:00
2016-02-16 15:07:42 +01:00
2016-04-12 18:07:25 +02:00
2016-03-09 17:35:50 +01:00
2016-02-17 10:22:22 +01:00
2016-04-07 17:51:09 +02:00
2016-02-04 13:03:53 +01:00
2016-03-10 18:00:14 +01:00