yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
df0c297f55e78fd7b642103e4caba4eb8a11e0c4
Umbraco-CMS/src/umbraco.editorControls/uploadfield
History
Shannon 59f8508332 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Attempt{T}.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
2014-02-20 13:40:17 +11:00
..
DataTypeUploadField.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00
uploadField.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-20 13:40:17 +11:00
uploadFieldPreValue.cs
Completes U4-2929 Finish obsoleting the remaining legacy property editors
2013-10-21 18:36:46 +11:00