yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
820069d5d5cd3d0da0c3c1829ff428113e94de6c
Umbraco-CMS/src/Umbraco.Tests/Manifest
History
Stephan 9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor 
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
2015-09-16 13:25:32 +02:00
..
ManifestParserTests.cs
Merge dev-v7 into dev-v7-contenttypeeditor
2015-09-16 13:25:32 +02:00