Files
Archetype/app
Kevin Giszewski bc58078eec Merge branch 'develop'
Conflicts:
	app/Umbraco/Umbraco.Archetype/Extensions/Extensions.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypeFieldsetModel.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePreValueProperty.cs
	app/Umbraco/Umbraco.Archetype/Models/ArchetypePropertyModel.cs
	app/Umbraco/Umbraco.Archetype/PropertyConverters/ArchetypeValueConverter.cs
2014-05-13 11:15:13 -04:00
..
2014-05-08 13:32:04 -04:00
2014-05-13 11:15:13 -04:00