yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
fed5a14e1ba6792b82c43b6558f6a4c6672dce6b
Umbraco-CMS/src/Umbraco.Web/Controllers
History
Shannon 508a40cd50 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
	src/Umbraco.Web/Models/RegisterModel.cs
2014-04-23 12:00:32 +10:00
..
UmbLoginController.cs
Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0
2014-03-13 14:12:02 +11:00
UmbLoginStatusController.cs
Merge commit '85a74e4fa700c83bab4bf3436f69f045029932cd' into 7.1.0
2014-03-13 14:12:02 +11:00
UmbProfileController.cs
Fixes merge issues
2014-03-18 19:05:07 +11:00
UmbRegisterController.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.2
2014-04-23 12:00:32 +10:00