Files
Umbraco-CMS/src/Umbraco.Web/Security
Shannon 029ace796d Merge remote-tracking branch 'origin/dev-v7' into dev-v7.7
# Conflicts:
#	src/Umbraco.Core/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
2017-09-18 20:04:05 +10:00
..