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-11-25 19:39:24 +01:00
2014-05-13 12:39:35 +02:00
2015-11-27 12:59:15 +01:00
2013-05-27 07:19:42 -02:00
2015-11-25 19:39:24 +01:00
2014-05-09 14:06:15 +10:00
2015-12-01 15:16:57 +01:00
2014-06-23 15:02:23 +10:00
2014-10-23 18:52:11 +10:00
2013-08-09 13:24:26 +10:00
2013-08-09 13:24:26 +10:00
2015-01-16 15:47:44 +11:00
2015-01-16 15:47:44 +11:00
2015-11-25 19:39:24 +01:00