yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
65db15487ea527a686710975c045ea89cffbc7df
Umbraco-CMS/src/Umbraco.Web/Controllers
History
Shannon 70eb3e8613 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	.gitignore
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Tests/Models/DataValueSetterTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/EditProfile.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViewMacros/Templates/Login.cshtml
	src/Umbraco.Web.UI/Umbraco/PartialViews/Templates/RegisterMember.cshtml
	src/Umbraco.Web/Controllers/RegisterController.cs
	src/Umbraco.Web/Models/ProfileModel.cs
	src/Umbraco.Web/Models/RegisterModel.cs
	src/Umbraco.Web/Models/UmbracoProperty.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
2013-09-03 17:30:08 +10:00
..
LoginController.cs
delete fontawesome
2013-09-02 15:40:14 +02:00
LoginStatusController.cs
delete fontawesome
2013-09-02 15:40:14 +02:00
ProfileController.cs
delete fontawesome
2013-09-02 15:40:14 +02:00
RegisterController.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-09-03 17:30:08 +10:00