Files
Umbraco-CMS/src/Umbraco.Core
Sebastiaan Janssen 9949e2676d Merge branch 'dev-v7' into 7.4.0
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/src/less/main.less
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/mediapicker.html
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/contentpicker/contentpicker.html
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/Dashboard.Release.config
	src/Umbraco.Web/Umbraco.Web.csproj
2015-12-01 15:16:57 +01:00
..
2015-07-13 22:45:37 +02:00
2015-11-27 16:54:02 +01:00
2015-12-01 15:16:57 +01:00
2015-12-01 15:16:57 +01:00
2015-10-29 13:08:37 +00:00
2015-05-11 12:26:53 +10:00
2014-07-10 10:39:28 +02:00
2015-06-23 09:56:19 +02:00
2015-01-29 17:09:04 +11:00
2014-12-04 11:36:15 +11:00
2014-07-10 10:39:28 +02:00
2015-09-10 11:20:01 +02:00
2015-11-17 17:25:01 +01:00
2015-06-25 11:15:57 +02:00