yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
d11eb485e1c4c1f91c5b1391450f771da4b0b670
Umbraco-CMS/src/Umbraco.Web/Controllers
History
Sebastiaan Janssen f6d56f51d4 Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0 
Conflicts:
	src/Umbraco.Core/Services/IRelationService.cs
	src/Umbraco.Web/Controllers/UmbRegisterController.cs
2014-04-02 12:01:55 +02: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 branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.1.0
2014-04-02 12:01:55 +02:00