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
..
2014-01-24 18:23:37 +11:00
2015-11-26 11:57:37 +01:00
2015-06-21 14:41:18 +02:00
2015-07-27 16:08:28 +02:00
2015-06-21 14:41:18 +02:00
2014-01-24 18:23:37 +11:00
2014-10-19 13:00:54 +02:00
2015-11-09 09:25:59 +01:00
2015-11-09 09:25:59 +01:00
2015-11-27 16:54:02 +01:00